Update helm translated README.zh.md

Co-authored-by: mirror58229 <674958229@qq.com>

.cursor/rules/plugin-development.mdc

@@ -0,0 +1,135 @@
+---
+description: Plugin Development Standards - Applies to all new wasm and golang-filter plugins
+globs:
+  - "plugins/wasm-go/extensions/*/**"
+  - "plugins/wasm-cpp/extensions/*/**"
+  - "plugins/wasm-rust/extensions/*/**"
+  - "plugins/wasm-assemblyscript/extensions/*/**"
+  - "plugins/golang-filter/*/**"
+alwaysApply: false
+---
+
+# Plugin Development Standards
+
+## Strict Requirements for New Independent Plugins
+
+When creating **new independent plugins** (e.g., newly implemented wasm plugins or golang-filter plugins), you **MUST** follow these standards:
+
+### 1. Design Documentation Directory Requirements
+
+- You **MUST** create a `design/` directory within the plugin directory
+- Directory structure example:
+  ```
+  plugins/wasm-go/extensions/my-new-plugin/
+    ├── design/
+    │   ├── design-doc.md          # Design document
+    │   ├── architecture.md         # Architecture (optional)
+    │   └── requirements.md         # Requirements (optional)
+    ├── main.go
+    ├── go.mod
+    └── README.md
+  ```
+
+### 2. Design Documentation Content Requirements
+
+The design documentation in the `design/` directory should include:
+
+- **Plugin Purpose and Use Cases**: Clearly explain what problem the plugin solves
+- **Core Functionality Design**: Detailed description of main features and implementation approach
+- **Configuration Parameters**: List all configuration items and their meanings
+- **Technology Selection and Dependencies**: Explain the technology stack and third-party libraries used
+- **Boundary Conditions and Limitations**: Define the applicable scope and limitations of the plugin
+- **Testing Strategy**: How to verify plugin functionality
+
+### 3. Documentation Provided to AI Coding Tools
+
+If you are using AI Coding tools (such as Cursor, GitHub Copilot, etc.) to generate code:
+
+- You **MUST** save the complete design documents, requirement descriptions, and prompts you provided to the AI in the `design/` directory
+- Recommended file naming:
+  - `ai-prompts.md` - AI prompts record
+  - `design-doc.md` - Complete design document
+  - `requirements.md` - Feature requirements list
+
+### 4. Files NOT to Commit to Git
+
+Note: The following files should **NOT** be committed to Git:
+- AI Coding tool work summary documents (should be placed in PR description)
+- Temporary feature change summary documents
+
+Design documents in the `design/` directory **SHOULD** be committed to Git, as they serve as the design basis and technical documentation for the plugin.
+
+## Examples
+
+### Good Plugin Directory Structure Example
+
+```
+plugins/wasm-go/extensions/ai-security-guard/
+  ├── design/
+  │   ├── design-doc.md          # ✅ Detailed design document
+  │   ├── ai-prompts.md          # ✅ Prompts provided to AI
+  │   └── architecture.png        # ✅ Architecture diagram
+  ├── main.go
+  ├── config.go
+  ├── README.md
+  └── go.mod
+```
+
+### Design Document Template
+
+When creating `design/design-doc.md`, you can refer to the following template:
+
+```markdown
+# [Plugin Name] Design Document
+
+## Overview
+- Plugin purpose
+- Problem it solves
+- Target users
+
+## Functional Design
+### Core Feature 1
+- Feature description
+- Implementation approach
+- Key code logic
+
+### Core Feature 2
+...
+
+## Configuration Parameters
+| Parameter | Type | Required | Description | Default |
+|-----------|------|----------|-------------|---------|
+| ...       | ...  | ...      | ...         | ...     |
+
+## Technical Implementation
+- Technology selection
+- Dependencies
+- Performance considerations
+
+## Test Plan
+- Unit tests
+- Integration tests
+- Boundary tests
+
+## Limitations and Notes
+- Known limitations
+- Usage recommendations
+```
+
+## Execution Checklist
+
+When creating a new plugin, please confirm:
+
+- [ ] Created `design/` directory within the plugin directory
+- [ ] Placed design documentation in the `design/` directory
+- [ ] If using AI Coding tools, saved prompts/requirement documents in the `design/` directory
+- [ ] Prepared AI Coding tool work summary (for PR description)
+- [ ] Design documentation is complete with necessary technical details
+
+## Tips
+
+- Design documentation is important technical documentation for the plugin, helpful for:
+  - Understanding design intent during code review
+  - Quickly understanding implementation approach during future maintenance
+  - Learning and reference for other developers
+  - Tracing the reasoning behind design decisions

.github/ISSUE_TEMPLATE/non--crash-security--bug.md

@@ -35,9 +35,15 @@ Just paste your stack trace here!
 
 ### Ⅴ. Anything else we need to know?
 
+> It is recommended to provided Higress runtime logs and configurations for us to investigate your issue, especially for controller and gateway components.
+> 
+> Please checkout following documents on how to obtain these data.
+> - https://higress.cn/docs/latest/ops/how-tos/view-logs/
+> - https://higress.cn/docs/latest/ops/how-tos/view-configs/
+
 
 ### Ⅵ. Environment:
 
 - Higress version:  
-- OS :
-- Others:
+- OS: 
+- Others: 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,51 @@
 <!-- Please make sure you have read and understood the contributing guidelines -->
 
-### Ⅰ. Describe what this PR did
+## Ⅰ. Describe what this PR did
 
 
-### Ⅱ. Does this pull request fix one issue?
+## Ⅱ. Does this pull request fix one issue?
 <!-- If that, add "fixes #xxx" below in the next line, for example, fixes #97. -->
 
 
-### Ⅲ. Why don't you add test cases (unit test/integration test)? 
+## Ⅲ. Why don't you add test cases (unit test/integration test)? 
 
 
-### Ⅳ. Describe how to verify it
+## Ⅳ. Describe how to verify it
+
+
+## Ⅴ. Special notes for reviews
+
+
+## Ⅵ. AI Coding Tool Usage Checklist (if applicable)
+<!-- 
+**IMPORTANT**: If you used AI Coding tools (e.g., Cursor, GitHub Copilot, etc.) to generate this PR, please check the following items.
+PRs that don't meet these requirements will have **LOWER REVIEW PRIORITY** and we **CANNOT GUARANTEE** timely reviews.
+
+If you did NOT use AI Coding tools, you can skip this section entirely.
+-->
+
+**Please check all applicable items:**
+
+- [ ] **For new standalone features** (e.g., new wasm plugin or golang-filter plugin):
+  - [ ] I have created a `design/` directory in the plugin folder
+  - [ ] I have added the design document to the `design/` directory
+  - [ ] I have included the AI Coding summary below
+
+- [ ] **For regular updates/changes** (not new plugins):
+  - [ ] I have provided the prompts/instructions I gave to the AI Coding tool below
+  - [ ] I have included the AI Coding summary below
+
+### AI Coding Prompts (for regular updates)
+<!-- Paste the prompts/instructions you provided to the AI Coding tool -->
+
+
+### AI Coding Summary
+<!-- 
+AI Coding tool should provide a summary after completing the work, including:
+- Key decisions made
+- Major changes implemented  
+- Important considerations or limitations
+-->
 
 
-### Ⅴ. Special notes for reviews
 

.github/workflows/build-and-push-wasm-plugin-image.yaml

@@ -122,7 +122,7 @@ jobs:
           set -e
           cd /workspace/plugins/wasm-go/extensions/${PLUGIN_NAME}
           go mod tidy
-          GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm main.go
+          GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm .
           tar czvf plugin.tar.gz plugin.wasm
           echo ${{ secrets.REGISTRY_PASSWORD }} | oras login -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin ${{ env.IMAGE_REGISTRY_SERVICE }}
           oras push ${target_image} ${push_command}

.github/workflows/build-and-test.yaml

@@ -2,18 +2,20 @@ name: "Build and Test"
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
     branches: ["*"]
 
+env:
+  GO_VERSION: 1.24
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
-      with:
-        go-version: 1.22
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
     # There are too many lint errors in current code bases
     # uncomment when we decide what lint should be addressed or ignored.
     # - run: make lint
@@ -21,40 +23,42 @@ jobs:
   coverage-test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: "Setup Go"
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.22
+      - name: "Setup Go"
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
 
-    - name: Setup Golang Caches
-      uses: actions/cache@v4
-      with:
-        path: |-
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-go
+      - name: Setup Golang Caches
+        uses: actions/cache@v4
+        with:
+          path: |-
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-go
 
-    - run: git stash # restore patch
+      - run: git stash # restore patch
 
-    # test
-    - name: Run Coverage Tests
-      run: |-
-        go version
-        GOPROXY="https://proxy.golang.org,direct" make go.test.coverage
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        fail_ci_if_error: false
-        files: ./coverage.xml
-        verbose: true
+      # test
+      - name: Run Coverage Tests
+        run: |-
+          go version
+          GOPROXY="https://proxy.golang.org,direct" make go.test.coverage
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          fail_ci_if_error: false
+          files: ./coverage.xml
+          verbose: true
 
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-    needs: [lint,coverage-test]
+    needs: [lint, coverage-test]
     steps:
       - name: "Checkout ${{ github.ref }}"
         uses: actions/checkout@v4
@@ -64,7 +68,7 @@ jobs:
       - name: "Setup Go"
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: ${{ env.GO_VERSION }}
 
       - name: Setup Golang Caches
         uses: actions/cache@v4
@@ -90,45 +94,52 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
   higress-conformance-test:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Free Up GitHub Actions Ubuntu Runner Disk Space 🔧
-      uses: jlumbroso/free-disk-space@main
-      with:
-        tool-cache: false
-        android: true
-        dotnet: true
-        haskell: true
-        large-packages: true
-        swap-storage: true
-      
-    - name: "Setup Go"
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.22
+      - name: Free Up GitHub Actions Ubuntu Runner Disk Space 🔧
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          swap-storage: true
 
-    - name: Setup Golang Caches
-      uses: actions/cache@v4
-      with:
-        path: |-
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ github.run_id }}
-        restore-keys: ${{ runner.os }}-go
-          
-    - run: git stash # restore patch
+      - name: "Setup Go"
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Setup Golang Caches
+        uses: actions/cache@v4
+        with:
+          path: |-
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ github.run_id }}
+          # key: ${{ runner.os }}-go-${{ env.GO_VERSION }}
+
+          restore-keys: ${{ runner.os }}-go
+
+      - run: git stash # restore patch
+
+      - name: update go mod
+        run: |-
+          make prebuild
+          go mod tidy
+
+      - name: "Run Higress E2E Conformance Tests"
+        run: GOPROXY="https://proxy.golang.org,direct" make higress-conformance-test
 
-    - name: "Run Higress E2E Conformance Tests"
-      run: GOPROXY="https://proxy.golang.org,direct" make higress-conformance-test
-      
   publish:
     runs-on: ubuntu-latest
-    needs: [higress-conformance-test,gateway-conformance-test]
+    needs: [higress-conformance-test, gateway-conformance-test]
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4

.github/workflows/generate-release-notes.yaml

@@ -29,6 +29,7 @@ jobs:
         run: |
           git clone https://github.com/github/github-mcp-server.git
           cd github-mcp-server
+          git checkout 5904a0365ec11f661ecea5c255e86860d279f3b1
           go build -o ../github-mcp-serve ./cmd/github-mcp-server
           cd ..
           chmod u+x github-mcp-serve
@@ -65,6 +66,40 @@ jobs:
               "https://github.com/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/releases/tag/${RELEASE_VERSION}" \
               -o release_page.html
 
+          # Extract system prompt content from HTML
+          echo "Extracting system prompt content..."
+          pip install beautifulsoup4 markdownify
+          SYSTEM_PROMPT=$(python3 -c "
+          import sys
+          from bs4 import BeautifulSoup
+          from markdownify import markdownify
+
+          with open('release_page.html', 'r') as f:
+              soup = BeautifulSoup(f, 'html.parser')
+          
+          system_prompt_header = soup.find('h2', string='system prompt')
+          if system_prompt_header:
+              content = []
+              for sibling in system_prompt_header.next_siblings:
+                  if sibling.name == 'h2':
+                      break
+                  content.append(str(sibling))
+              html_content = ''.join(content).strip()
+              # Convert HTML to Markdown
+              if html_content:
+                  markdown_content = markdownify(html_content)
+                  print(markdown_content.strip())
+              else:
+                  print('')
+          else:
+              print('')
+          ")
+          if [ -z "${SYSTEM_PROMPT}" ]; then
+              echo "No system prompt found in release notes."
+          else
+              echo "System prompt content: ${SYSTEM_PROMPT}"
+          fi
+
           echo "Extracting PR numbers from ${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME} release notes..."
           PR_NUMS=$(cat release_page.html | grep -o "/${GITHUB_REPO_OWNER}/${GITHUB_REPO_NAME}/pull/[0-9]*" | grep -o "[0-9]*$" | sort -n | uniq | tr '\n' ',')
           PR_NUMS=${PR_NUMS%,}
@@ -87,11 +122,24 @@ jobs:
           cd higress-report-agent
           pip install uv
           uv sync
+
+          # Build command
+          CMD_ARGS="--mode 2 --choice 2 --pr_nums ${PR_NUMS}"
           if [ -n "${IMPORTANT_PR_NUMS}" ]; then
-              uv run report_main.py --mode 2 --choice 2 --pr_nums ${PR_NUMS} --important_prs ${IMPORTANT_PR_NUMS}
-          else
-              uv run report_main.py --mode 2 --choice 2 --pr_nums ${PR_NUMS}
+              CMD_ARGS="${CMD_ARGS} --important_prs ${IMPORTANT_PR_NUMS}"
           fi
+          if [ -n "${SYSTEM_PROMPT}" ]; then
+              echo "${SYSTEM_PROMPT}" > temp_system_prompt.txt
+              CMD_ARGS="${CMD_ARGS} --sys_prompt_file temp_system_prompt.txt"
+          fi
+
+          uv run report_main.py ${CMD_ARGS}
+
+          # Clean up temporary file
+          if [ -f "temp_system_prompt.txt" ]; then
+              rm temp_system_prompt.txt
+          fi
+
           cp report.md ../
           cp report.EN.md ../
           cd ..

.github/workflows/wasm-plugin-unit-test.yml

@@ -0,0 +1,427 @@
+name: Wasm Plugin Unit Tests(GO)
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - 'plugins/wasm-go/extensions/**'
+      - '.github/workflows/wasm-plugin-unit-test.yml'
+      - 'go.mod'
+      - 'go.sum'
+  pull_request:
+    branches: [ "*" ]
+    paths:
+      - 'plugins/wasm-go/extensions/**'
+      - '.github/workflows/wasm-plugin-unit-test.yml'
+      - 'go.mod'
+      - 'go.sum'
+
+env:
+  GO111MODULE: on
+  CGO_ENABLED: 0
+  GOOS: linux
+  GOARCH: amd64
+
+jobs:
+  detect-changed-plugins:
+    name: Detect Changed Plugins
+    runs-on: ubuntu-latest
+    outputs:
+      changed-plugins: ${{ steps.detect.outputs.plugins }}
+      has-changes: ${{ steps.detect.outputs.has-changes }}
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # 获取完整历史用于比较
+        
+    - name: Detect changed plugins
+      id: detect
+      run: |
+        # 获取变更的文件列表
+        if [ "${{ github.event_name }}" = "pull_request" ]; then
+          # PR模式：比较目标分支和源分支
+          git fetch origin ${{ github.base_ref }}
+          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
+        else
+          # Push模式：比较当前提交和上一个提交
+          CHANGED_FILES=$(git diff --name-only HEAD~1 HEAD)
+        fi
+        
+        echo "Changed files:"
+        echo "$CHANGED_FILES"
+        
+        # 提取变更的插件名称
+        CHANGED_PLUGINS=""
+        for file in $CHANGED_FILES; do
+          if [[ $file =~ ^plugins/wasm-go/extensions/([^/]+)/ ]]; then
+            PLUGIN_NAME="${BASH_REMATCH[1]}"
+            if [[ ! " $CHANGED_PLUGINS " =~ " $PLUGIN_NAME " ]]; then
+              # 修复：只在非空时添加空格
+              if [ -z "$CHANGED_PLUGINS" ]; then
+                CHANGED_PLUGINS="$PLUGIN_NAME"
+              else
+                CHANGED_PLUGINS="$CHANGED_PLUGINS $PLUGIN_NAME"
+              fi
+            fi
+          fi
+        done
+        
+        # 如果没有插件变更，不触发测试
+        if [ -z "$CHANGED_PLUGINS" ]; then
+          echo "No plugin changes detected, skipping tests"
+          echo "has-changes=false" >> $GITHUB_OUTPUT
+          echo "plugins=[]" >> $GITHUB_OUTPUT
+        else
+          echo "Changed plugins: $CHANGED_PLUGINS"
+          echo "has-changes=true" >> $GITHUB_OUTPUT
+          # 将空格分隔转换为 JSON 数组格式
+          PLUGINS_JSON=$(echo "$CHANGED_PLUGINS" | sed 's/ /","/g' | sed 's/^/["/' | sed 's/$/"]/')
+          echo "PLUGINS_JSON: $PLUGINS_JSON"
+          echo "plugins=$PLUGINS_JSON" >> $GITHUB_OUTPUT
+        fi
+
+  test:
+    name: Test Changed Plugins
+    runs-on: ubuntu-latest
+    needs: detect-changed-plugins
+    if: needs.detect-changed-plugins.outputs.has-changes == 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        plugin: ${{ fromJSON(needs.detect-changed-plugins.outputs.changed-plugins) }}
+      
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+      
+    - name: Set up Go 1.24
+      uses: actions/setup-go@v4
+      with:
+        go-version: 1.24
+        cache: true
+        
+    - name: Install test tools
+      run: |
+        go install gotest.tools/gotestsum@latest
+        # 移除gocov工具，直接使用Codecov
+        
+    - name: Build WASM for ${{ matrix.plugin }}
+      working-directory: plugins/wasm-go/extensions/${{ matrix.plugin }}
+      run: |
+        echo "Building WASM for ${{ matrix.plugin }}..."
+        
+        # 检查是否存在main.go文件
+        
+        export GOOS=wasip1
+        export GOARCH=wasm
+        
+        # 构建WASM文件，失败时直接退出
+        if ! go build -buildmode=c-shared -o main.wasm ./; then
+          echo "❌ WASM build failed for ${{ matrix.plugin }}"
+          exit 1
+        fi
+        
+        # 验证WASM文件是否生成
+        if [ ! -f "main.wasm" ]; then
+          echo "❌ WASM file not generated for ${{ matrix.plugin }}"
+          exit 1
+        fi
+        
+        echo "✅ WASM build successful for ${{ matrix.plugin }}"
+
+        
+    - name: Set WASM_PATH environment variable
+      run: |
+        echo "WASM_PATH=$(pwd)/plugins/wasm-go/extensions/${{ matrix.plugin }}/main.wasm" >> $GITHUB_ENV
+        
+    - name: Run tests with coverage for ${{ matrix.plugin }}
+      working-directory: plugins/wasm-go/extensions/${{ matrix.plugin }}
+      run: |
+        # 检查是否存在main_test.go文件
+        if [ -f "main_test.go" ]; then
+          echo "Running tests for ${{ matrix.plugin }}..."
+          
+          # 运行测试并生成覆盖率报告
+          gotestsum --junitfile ../../../../test-results-${{ matrix.plugin }}.xml \
+                   --format standard-verbose \
+                   --jsonfile ../../../../test-output-${{ matrix.plugin }}.json \
+                   -- -coverprofile=coverage-${{ matrix.plugin }}.out -covermode=atomic -coverpkg=./... ./...
+          
+          echo "✅ Tests completed for ${{ matrix.plugin }}"
+        else
+          echo "No tests found for ${{ matrix.plugin }}, skipping..."
+          # 创建空的测试结果文件
+          echo '<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="no-tests" tests="0" failures="0" errors="0" time="0"></testsuite></testsuites>' > ../../../../test-results-${{ matrix.plugin }}.xml
+        fi
+        
+    - name: Upload test results for ${{ matrix.plugin }}
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-results-${{ matrix.plugin }}
+        path: |
+          test-results-${{ matrix.plugin }}.xml
+          test-output-${{ matrix.plugin }}.json
+        retention-days: 30
+        
+    - name: Upload coverage report for ${{ matrix.plugin }}
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: coverage-${{ matrix.plugin }}
+        path: plugins/wasm-go/extensions/${{ matrix.plugin }}/coverage-${{ matrix.plugin }}.out
+        retention-days: 30
+        
+    - name: Upload coverage to Codecov for ${{ matrix.plugin }}
+      uses: codecov/codecov-action@v4
+      if: always()
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        file: plugins/wasm-go/extensions/${{ matrix.plugin }}/coverage-${{ matrix.plugin }}.out
+        flags: wasm-go-plugin-${{ matrix.plugin }}
+        name: codecov-${{ matrix.plugin }}
+        fail_ci_if_error: false
+        verbose: true
+
+  test-summary:
+    name: Test Summary & Coverage
+    runs-on: ubuntu-latest
+    needs: [detect-changed-plugins, test]
+    if: always() && needs.detect-changed-plugins.outputs.has-changes == 'true'
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Set up Go 1.24
+      uses: actions/setup-go@v4
+      with:
+        go-version: 1.24
+        cache: true
+        
+    - name: Install required tools
+      run: |
+        go install github.com/wadey/gocovmerge@latest
+        sudo apt-get update && sudo apt-get install -y bc
+        
+    - name: Download all test results
+      uses: actions/download-artifact@v4
+      with:
+        pattern: test-results-*
+        merge-multiple: true
+        path: ${{ github.workspace }}
+        
+    - name: Download all coverage files
+      uses: actions/download-artifact@v4
+      with:
+        pattern: coverage-*
+        merge-multiple: true
+        path: ${{ github.workspace }}
+        
+
+        
+    - name: Generate comprehensive test summary
+      run: |
+        echo "## 🧪 Go Plugin Test Results" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        
+        total_plugins=0
+        passed_plugins=0
+        failed_plugins=0
+        total_tests=0
+        total_failures=0
+        total_errors=0
+        
+        echo "### 📊 Test Results by Plugin" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        
+        for result_file in test-results-*.xml; do
+          if [ -f "$result_file" ]; then
+            plugin_name=$(echo "$result_file" | sed 's/test-results-\(.*\)\.xml/\1/')
+            total_plugins=$((total_plugins + 1))
+            
+            # 解析XML获取测试结果
+            if grep -q '<testsuite' "$result_file"; then
+              # 使用grep解析XML属性，更稳定可靠
+              tests=$(grep -o 'tests="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
+              failures=$(grep -o 'failures="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
+              errors=$(grep -o 'errors="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
+              time=$(grep -o 'time="[0-9.]*"' "$result_file" | head -1 | grep -o '[0-9.]*' || echo "0")
+              
+              # 确保数值有效，避免bash算术运算错误
+              tests=${tests:-0}
+              failures=${failures:-0}
+              errors=${errors:-0}
+              
+              # 转换为整数进行算术运算
+              total_tests=$((total_tests + tests))
+              total_failures=$((total_failures + failures))
+              total_errors=$((total_errors + errors))
+              
+              if [ "$failures" = "0" ] && [ "$errors" = "0" ]; then
+                echo "✅ **$plugin_name**: $tests tests passed in ${time}s" >> $GITHUB_STEP_SUMMARY
+                passed_plugins=$((passed_plugins + 1))
+              else
+                echo "❌ **$plugin_name**: $tests tests, $failures failures, $errors errors in ${time}s" >> $GITHUB_STEP_SUMMARY
+                failed_plugins=$((failed_plugins + 1))
+              fi
+            else
+              echo "⚠️ **$plugin_name**: No tests found" >> $GITHUB_STEP_SUMMARY
+            fi
+          fi
+        done
+        
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "### 📈 Coverage Report" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        
+        # 覆盖率门禁检查
+        coverage_failed=false
+        
+        # 解析覆盖率文件 - 使用find命令查找覆盖率文件
+        coverage_files=$(find ${{ github.workspace }} -name "coverage-*.out")
+        
+        if [ -n "$coverage_files" ]; then
+          echo "Found coverage files:"
+          echo "$coverage_files"
+        fi
+        
+        for coverage_file in $coverage_files; do
+          if [ -f "$coverage_file" ]; then
+            plugin_name=$(basename "$coverage_file" | sed 's/coverage-\(.*\)\.out/\1/')
+            
+            # 将覆盖率文件复制到对应插件目录，避免go tool cover的模块依赖问题
+            echo "Processing coverage file: $coverage_file"
+            
+            # 检查覆盖率文件是否存在且非空
+            if [ -s "$coverage_file" ]; then
+              # 将覆盖率文件复制到对应插件目录
+              plugin_dir="plugins/wasm-go/extensions/$plugin_name"
+              if [ -d "$plugin_dir" ]; then
+                cp "$coverage_file" "$plugin_dir/"
+                cd "$plugin_dir"
+                
+                # 在插件目录中运行go tool cover，使用正确的模块环境
+                coverage_stats=$(go tool cover -func="$(basename "$coverage_file")" 2>&1 | tail -1)
+                cd - > /dev/null
+                
+                # 清理复制的文件
+                rm -f "$plugin_dir/$(basename "$coverage_file")"
+              else
+                echo "Plugin directory not found: $plugin_dir"
+                coverage_stats=""
+              fi
+              
+              echo "Coverage stats result: $coverage_stats"
+              
+              if [ -n "$coverage_stats" ] && echo "$coverage_stats" | grep -q "%"; then
+                # 提取覆盖率百分比
+                coverage_percent=$(echo "$coverage_stats" | grep -o '[0-9.]*%' | head -1 | sed 's/%//')
+                
+                # 确保数值有效
+                coverage_percent=${coverage_percent:-0}
+                
+                if (( $(echo "$coverage_percent > 0" | bc -l) )); then
+                  # 根据覆盖率设置颜色和图标
+                  if (( $(echo "$coverage_percent >= 80" | bc -l) )); then
+                    coverage_icon="🟢"
+                  elif (( $(echo "$coverage_percent >= 30" | bc -l) )); then
+                    coverage_icon="🟡"
+                  else
+                    coverage_icon="🔴"
+                    coverage_failed=true
+                  fi
+                  
+                  echo "$coverage_icon **$plugin_name**: $coverage_percent%" >> $GITHUB_STEP_SUMMARY
+                  
+                  # 检查覆盖率门禁
+                  if (( $(echo "$coverage_percent < 30" | bc -l) )); then
+                    echo "❌ **$plugin_name**: Coverage below 30% threshold!" >> $GITHUB_STEP_SUMMARY
+                  fi
+                else
+                  echo "⚪ **$plugin_name**: No statements to cover" >> $GITHUB_STEP_SUMMARY
+                fi
+              else
+                echo "⚪ **$plugin_name**: Coverage data unavailable" >> $GITHUB_STEP_SUMMARY
+              fi
+            else
+              echo "⚪ **$plugin_name**: Coverage file is empty or invalid" >> $GITHUB_STEP_SUMMARY
+            fi
+          fi
+        done
+        
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "📊 **Coverage reports are now available on Codecov**" >> $GITHUB_STEP_SUMMARY
+        echo "🔗 **This Commit Coverage**: https://codecov.io/gh/${{ github.repository }}/commit/${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        
+        # 覆盖率门禁检查
+        if [ "$coverage_failed" = true ]; then
+          echo "### ❌ Coverage Gate Failed" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "🚫 **Coverage threshold not met**: Some plugins have coverage below 30%" >> $GITHUB_STEP_SUMMARY
+          echo "📋 **Please improve test coverage before merging this PR**" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          # 退出CI失败
+          echo "Coverage gate failed - some plugins below 30% threshold"
+          exit 1
+        else
+          echo "### ✅ Coverage Gate Passed" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "🎉 **All plugins meet the 30% coverage threshold**" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+        fi
+        
+        echo "### 🎯 Summary" >> $GITHUB_STEP_SUMMARY
+        echo "- **Total plugins**: $total_plugins" >> $GITHUB_STEP_SUMMARY
+        echo "- **Passed**: $passed_plugins ✅" >> $GITHUB_STEP_SUMMARY
+        echo "- **Failed**: $failed_plugins ❌" >> $GITHUB_STEP_SUMMARY
+        echo "- **Total tests**: $total_tests" >> $GITHUB_STEP_SUMMARY
+        echo "- **Total failures**: $total_failures" >> $GITHUB_STEP_SUMMARY
+        echo "- **Total errors**: $total_errors" >> $GITHUB_STEP_SUMMARY
+        
+        # 如果有失败，显示详细信息
+        if [ $total_failures -gt 0 ] || [ $total_errors -gt 0 ]; then
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### ❌ Failed Tests Details" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Failed plugins**: $failed_plugins" >> $GITHUB_STEP_SUMMARY
+          echo "**Total failures**: $total_failures" >> $GITHUB_STEP_SUMMARY
+          echo "**Total errors**: $total_errors" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "📋 **View detailed logs**: [Click here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          # 显示每个失败插件的详细信息
+          echo "#### 📊 Failed Plugin Details" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          for result_file in test-results-*.xml; do
+            if [ -f "$result_file" ]; then
+              plugin_name=$(echo "$result_file" | sed 's/test-results-\(.*\)\.xml/\1/')
+              
+              # 检查是否有失败
+              failures=$(grep -o 'failures="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
+              errors=$(grep -o 'errors="[0-9]*"' "$result_file" | head -1 | grep -o '[0-9]*' || echo "0")
+              
+              # 确保数值有效
+              failures=${failures:-0}
+              errors=${errors:-0}
+              
+              if [ "$failures" -gt 0 ] || [ "$errors" -gt 0 ]; then
+                echo "**$plugin_name**:" >> $GITHUB_STEP_SUMMARY
+                echo "- Failures: $failures" >> $GITHUB_STEP_SUMMARY
+                echo "- Errors: $errors" >> $GITHUB_STEP_SUMMARY
+                echo "- [View plugin logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+                echo "" >> $GITHUB_STEP_SUMMARY
+              fi
+            fi
+          done
+        fi

.gitmodules

@@ -1,17 +1,17 @@
 [submodule "istio/api"]
 	path = istio/api
 	url = https://github.com/higress-group/api
-	branch = istio-1.19
+	branch = istio-1.27
 	shallow = true
 [submodule "istio/istio"]
 	path = istio/istio
 	url = https://github.com/higress-group/istio
-	branch = istio-1.19
+	branch = istio-1.27
 	shallow = true
 [submodule "istio/client-go"]
 	path = istio/client-go
 	url = https://github.com/higress-group/client-go
-	branch = istio-1.19
+	branch = istio-1.27
 	shallow = true
 [submodule "istio/pkg"]
 	path = istio/pkg
@@ -26,7 +26,7 @@
 [submodule "envoy/go-control-plane"]
 	path = envoy/go-control-plane
 	url = https://github.com/higress-group/go-control-plane
-	branch = istio-1.19
+	branch = istio-1.27
 	shallow = true
 [submodule "envoy/envoy"]
 	path = envoy/envoy

.licenserc.yaml

@@ -35,6 +35,7 @@ header:
     - 'hgctl/pkg/manifests'
     - 'pkg/ingress/kube/gateway/istio/testdata'
     - 'release-notes/**'
+    - '.cursor/**'    
 
   comment: on-failure
 dependency:

ADOPTERS.md

@@ -0,0 +1,13 @@
+# Adopters of Higress
+
+Below are the adopters of the Higress project. If you are using Higress in your organization, please add your name to the list by submitting a pull request: this will help foster the Higress community. Kindly ensure the list remains in alphabetical order.
+
+
+| Organization                          | Contact (GitHub User Name)             | Environment                                | Description of Use                                                    |
+|---------------------------------------|----------------------------------------|--------------------------------------------|-----------------------------------------------------------------------|
+| [antdigital](https://antdigital.com/) | [@Lovelcp](https://github.com/Lovelcp) | Production  | Ingress Gateway, Microservice gateway, LLM Gateway, MCP Gateway |
+| [kuaishou](https://ir.kuaishou.com/) | [@maplecap](https://github.com/maplecap) | Production | LLM Gateway |
+| [Trip.com](https://www.trip.com/)     | [@CH3CHO](https://github.com/CH3CHO)   | Production  | LLM Gateway, MCP Gateway |
+| [vipshop](https://github.com/vipshop/) | [@firebook](https://github.com/firebook) | Production  | LLM Gateway, MCP Gateway, Inference Gateway |
+| [labring](https://github.com/labring/) | [@zzjin](https://github.com/zzjin) | Production  | Ingress Gateway |
+| < company name here>                  | < your github handle here >            | <Production/Testing/Experimenting/etc>       | <Ingress Gateway/Microservice gateway/LLM Gateway/MCP Gateway/Inference Gateway>                                       |

CODEOWNERS

@@ -3,7 +3,7 @@
 /istio @SpecialYang @johnlanni
 /pkg @SpecialYang @johnlanni @CH3CHO
 /plugins @johnlanni @CH3CHO @rinfx @erasernoob
-/plugins/wasm-go/extensions/ai-proxy @cr7258 @CH3CHO @rinfx @wydream
+/plugins/wasm-go/extensions/ai-proxy @rinfx @wydream @johnlanni
 /plugins/wasm-rust @007gzs @jizhuozhi
 /registry @Erica177 @2456868764 @johnlanni
 /test @Xunzhuo @2456868764 @CH3CHO

CONTRIBUTING_CN.md

@@ -169,6 +169,31 @@ git config --get user.email
 
 PR 是更改 Higress 项目文件的唯一方法。为了帮助审查人更好地理解你的目的，PR 描述不能太详细。我们鼓励贡献者遵循 [PR 模板](./.github/PULL_REQUEST_TEMPLATE.md) 来完成拉取请求。
 
+#### 使用 AI Coding 工具的特殊要求
+
+如果你使用 AI Coding 工具（如 Cursor、GitHub Copilot 等）来生成 PR，我们有以下**严格要求**：
+
+**针对新增独立插件的场景**（例如新实现的 wasm 插件或 golang-filter 插件）：
+- 你**必须**在插件目录下创建 `design/` 目录
+- 将你提供给 AI Coding 工具的设计文档放在 `design/` 目录中
+- 在 PR 描述中提供 AI Coding 工具生成的工作总结
+
+**针对日常更新/修改的场景**：
+- 在 PR 描述中提供你给 AI Coding 工具的提示词/指令
+- 在 PR 描述中提供 AI Coding 工具生成的工作总结
+
+**AI Coding 工作总结应包括**：
+- 做出的关键决策
+- 实现的主要更改
+- 重要的注意事项或限制
+
+**Review 优先级说明**：
+- 如果你使用了 AI Coding 工具但没有按照上述要求操作，你的 PR review 优先级将会**降低**
+- 我们**无法保证**对不符合要求的 AI Coding PR 进行及时 review
+- 如果不是使用 AI Coding 工具完成的 PR，则不需要遵循这些额外要求
+
+这些要求的目的是确保使用 AI 生成的代码具有充分的文档记录和可追溯性，便于代码审查和后续维护。通过要求提供提示词/设计文档，我们可以更好地理解开发意图和上下文。
+
 ### 开发前准备
 
 ```shell

CONTRIBUTING_EN.md

@@ -169,6 +169,31 @@ No matter commit message, or commit content, we do take more emphasis on code re
 
 PR is the only way to make change to Higress project files. To help reviewers better get your purpose, PR description could not be too detailed. We encourage contributors to follow the [PR template](./.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request.
 
+#### Special Requirements for AI Coding Tool Usage
+
+If you use AI Coding tools (such as Cursor, GitHub Copilot, etc.) to generate PRs, we have the following **strict requirements**:
+
+**For new standalone plugin scenarios** (e.g., newly implemented wasm plugins or golang-filter plugins):
+- You **MUST** create a `design/` directory under the plugin directory
+- Place the design document you provided to the AI Coding tool in the `design/` directory
+- Provide an AI Coding summary in the PR description
+
+**For regular updates/changes scenarios**:
+- Provide the prompts/instructions you gave to the AI Coding tool in the PR description
+- Provide an AI Coding summary in the PR description
+
+**AI Coding Summary should include**:
+- Key decisions made
+- Major changes implemented
+- Important considerations or limitations
+
+**Review Priority Notice**:
+- If you use AI Coding tools but do not follow the above requirements, your PR review priority will be **lowered**
+- We **cannot guarantee** timely reviews for AI Coding PRs that do not meet these requirements
+- If the PR is not completed using AI Coding tools, these additional requirements do not apply
+
+The purpose of these requirements is to ensure that AI-generated code is adequately documented and traceable, facilitating code review and subsequent maintenance. By requiring prompts/design documents, we can better understand the development intent and context.
+
 ### Pre-development preparation
 
 ```shell

CONTRIBUTING_JP.md

@@ -164,6 +164,31 @@ git config --get user.email
 
 PR は Higress プロジェクトファイルを変更する唯一の方法です。レビュアーが目的をよりよく理解できるようにするために、PR 説明は詳細すぎることはありません。貢献者には、[PR テンプレート](./.github/PULL_REQUEST_TEMPLATE.md) に従ってプルリクエストを完了することを奨励します。
 
+#### AI Coding ツール使用時の特別な要件
+
+AI Coding ツール（Cursor、GitHub Copilot など）を使用して PR を生成する場合、以下の**厳格な要件**があります：
+
+**新規独立プラグインのシナリオ**（新しく実装された wasm プラグインや golang-filter プラグインなど）の場合：
+- プラグインディレクトリの下に `design/` ディレクトリを作成する**必要があります**
+- AI Coding ツールに提供した設計ドキュメントを `design/` ディレクトリに配置してください
+- PR の説明に AI Coding サマリーを提供してください
+
+**通常の更新/変更のシナリオ**の場合：
+- PR の説明に AI Coding ツールに与えたプロンプト/指示を提供してください
+- PR の説明に AI Coding サマリーを提供してください
+
+**AI Coding サマリーには以下を含める必要があります**：
+- 行われた重要な決定
+- 実装された主要な変更
+- 重要な考慮事項または制限事項
+
+**レビュー優先度に関する通知**：
+- AI Coding ツールを使用したが上記の要件に従わなかった場合、PR のレビュー優先度が**低下**します
+- 要件を満たしていない AI Coding PR に対して、タイムリーなレビューを**保証できません**
+- AI Coding ツールを使用せずに完了した PR の場合、これらの追加要件は適用されません
+
+これらの要件の目的は、AI で生成されたコードが十分に文書化され、追跡可能であることを保証し、コードレビューと後続のメンテナンスを容易にすることです。プロンプト/設計ドキュメントを要求することで、開発意図とコンテキストをより良く理解できます。
+
 ### 開発前の準備
 
 ```shell

DEP_VERSION

@@ -1 +1 @@
-higress-console: v2.1.6
+higress-console: v2.1.9

Makefile.core.mk

@@ -10,7 +10,7 @@ export BASE_VERSION ?= $(HIGRESS_BASE_VERSION)
 
 export CHARTS ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/charts
 
-VERSION_PACKAGE := github.com/alibaba/higress/pkg/cmd/lversion
+VERSION_PACKAGE := github.com/alibaba/higress/v2/pkg/cmd/lversion
 
 GIT_COMMIT:=$(shell git rev-parse HEAD)
 
@@ -137,14 +137,16 @@ endif
 # for now docker is limited to Linux compiles - why ?
 include docker/docker.mk
 
-docker-build: docker.higress ## Build and push docker images to registry defined by $HUB and $TAG
+docker-build-amd64: clean-higress docker.higress-amd64 ## Build and push amdd64 docker images to registry defined by $HUB and $TAG
+
+docker-build: clean-higress docker.higress ## Build and push docker images to registry defined by $HUB and $TAG
 
 docker-buildx-push: clean-env docker.higress-buildx
 
 export PARENT_GIT_TAG:=$(shell cat VERSION)
 export PARENT_GIT_REVISION:=$(TAG)
 
-export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.8/envoy-symbol-ARCH.tar.gz
+export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.2.0/envoy-symbol-ARCH.tar.gz
 
 build-envoy: prebuild
 	./tools/hack/build-envoy.sh
@@ -164,9 +166,15 @@ build-gateway: prebuild buildx-prepare build-golang-filter
 	USE_REAL_USER=1 TARGET_ARCH=arm64 DOCKER_TARGETS="docker.proxyv2" ./tools/hack/build-istio-image.sh init
 	DOCKER_TARGETS="docker.proxyv2" IMG_URL="${IMG_URL}" ./tools/hack/build-istio-image.sh docker.buildx
 
-build-gateway-local: prebuild build-golang-filter
+build-gateway-local: prebuild build-golang-filter-amd64
 	TARGET_ARCH=${TARGET_ARCH} DOCKER_TARGETS="docker.proxyv2" ./tools/hack/build-istio-image.sh docker
 
+build-golang-filter-amd64:
+	TARGET_ARCH=amd64 ./tools/hack/build-golang-filters.sh
+
+build-golang-filter-arm64:
+	TARGET_ARCH=arm64 ./tools/hack/build-golang-filters.sh
+
 build-golang-filter:
 	TARGET_ARCH=amd64 ./tools/hack/build-golang-filters.sh
 	TARGET_ARCH=arm64 ./tools/hack/build-golang-filters.sh
@@ -192,8 +200,8 @@ install: pre-install
 	helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true'
 
 HIGRESS_LATEST_IMAGE_TAG ?= latest
-ENVOY_LATEST_IMAGE_TAG ?= latest
-ISTIO_LATEST_IMAGE_TAG ?= latest
+ENVOY_LATEST_IMAGE_TAG ?= cdf0f16bf622102f89a0d0257834f43f502e4b99
+ISTIO_LATEST_IMAGE_TAG ?= a7525f292c38d7d3380f3ce7ee971ad6e3c46adf
 
 install-dev: pre-install
 	helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true'

README.md

@@ -17,11 +17,14 @@
 </div>
 
 [**Official Site**](https://higress.ai/en/) &nbsp; |
+&nbsp; [**Docs**](https://higress.cn/en/docs/latest/overview/what-is-higress/) &nbsp; |
+&nbsp; [**Blog**](https://higress.cn/en/blog/) &nbsp; |
 &nbsp; [**MCP Server QuickStart**](https://higress.cn/en/ai/mcp-quick-start/) &nbsp; |
+&nbsp; [**Developer Guide**](https://higress.cn/en/docs/latest/dev/architecture/) &nbsp; |
 &nbsp; [**Wasm Plugin Hub**](https://higress.cn/en/plugin/) &nbsp; |
 
 <p>
-   English | <a href="README_ZH.md">中文<a/> | <a href="README_JP.md">日本語<a/>
+   English | <a href="README_ZH.md">中文</a> | <a href="README_JP.md">日本語</a>
 </p>
 
 ## What is Higress?
@@ -40,6 +43,13 @@ Higress's AI gateway capabilities support all [mainstream model providers](https
 
 Higress was born within Alibaba to solve the issues of Tengine reload affecting long-connection services and insufficient load balancing capabilities for gRPC/Dubbo. Within Alibaba Cloud, Higress's AI gateway capabilities support core AI applications such as Tongyi Bailian model studio, machine learning PAI platform, and other critical AI services. Alibaba Cloud has built its cloud-native API gateway product based on Higress, providing 99.99% gateway high availability guarantee service capabilities for a large number of enterprise customers.
 
+You can click the button below to install the enterprise version of Higress:
+
+[![Deploy on AlibabaCloud](https://img.alicdn.com/imgextra/i1/O1CN01e6vwe71EWTHoZEcpK_!!6000000000359-55-tps-170-40.svg)](https://www.aliyun.com/product/apigateway?spm=higress-github.topbar.0.0.0)
+
+
+If you use open-source Higress and wish to obtain enterprise-level support, you can contact the project maintainer johnlanni's email: **zty98751@alibaba-inc.com** or social media accounts (WeChat ID: **nomadao**, DingTalk ID: **chengtanzty**). Please note **Higress** when adding as a friend :)
+
 ## Summary
 
 - [**Quick Start**](#quick-start)    
@@ -72,10 +82,15 @@ Port descriptions:
 > 
 > If you experience a timeout when pulling image from `higress-registry.cn-hangzhou.cr.aliyuncs.com`, you can try replacing it with the following docker registry mirror source:
 > 
+> **North America**: `higress-registry.us-west-1.cr.aliyuncs.com`
+> 
 > **Southeast Asia**: `higress-registry.ap-southeast-7.cr.aliyuncs.com`
 
 For other installation methods such as Helm deployment under K8s, please refer to the official [Quick Start documentation](https://higress.io/en-us/docs/user/quickstart).
 
+If you are deploying on the cloud, it is recommended to use the [Enterprise Edition](https://www.aliyun.com/product/apigateway?spm=higress-github.topbar.0.0.0)
+
+
 ## Use Cases
 
 - **MCP Server Hosting**:

README_JP.md

@@ -18,7 +18,7 @@
 
 
 <p>
-   <a href="README_EN.md"> English <a/> | <a href="README.md">中文<a/> | 日本語
+   <a href="README.md"> English </a> | <a href="README_ZH.md">中文</a> | 日本語
 </p>
 
 

README_ZH.md

@@ -17,6 +17,7 @@
 [**官网**](https://higress.cn/)   |
   [**文档**](https://higress.cn/docs/latest/overview/what-is-higress/)   |
   [**博客**](https://higress.cn/blog/)   |
+  [**MCP Server 快速开始**](https://higress.cn/ai/mcp-quick-start/)   |
   [**电子书**](https://higress.cn/docs/ebook/wasm14/)   |
   [**开发指引**](https://higress.cn/docs/latest/dev/architecture/)   |
   [**AI插件**](https://higress.cn/plugin/)  
@@ -24,7 +25,7 @@
 
 
 <p>
-   <a href="README.md"> English <a/>| 中文 | <a href="README_JP.md"> 日本語 <a/> 
+   <a href="README.md"> English </a>| 中文 | <a href="README_JP.md"> 日本語 </a> 
 </p>
 
 
@@ -44,6 +45,11 @@ Higress 的 AI 网关能力支持国内外所有[主流模型供应商](https://
 
 Higress 在阿里内部为解决 Tengine reload 对长连接业务有损，以及 gRPC/Dubbo 负载均衡能力不足而诞生。在阿里云内部，Higress 的 AI 网关能力支撑了通义千问 APP、通义百炼模型工作室、机器学习 PAI 平台等核心 AI 应用。同时服务国内头部的 AIGC 企业（如零一万物），以及 AI 产品（如 FastGPT）。阿里云基于 Higress 构建了云原生 API 网关产品，为大量企业客户提供 99.99% 的网关高可用保障服务能力。
 
+可以点下方按钮安装企业版 Higress: 
+
+[![Deploy on AlibabaCloud](https://img.alicdn.com/imgextra/i4/O1CN01tHRaNm22hflDqxKV5_!!6000000007152-55-tps-170-40.svg)](https://www.aliyun.com/product/apigateway?spm=higress-github.topbar.0.0.0)
+
+如果您使用开源的Higress并希望获得企业级支持，可以联系johnlanni的邮箱：zty98751@alibaba-inc.com或社交媒体账号（微信号：nomadao，钉钉号：chengtanzty）。添加好友时请备注Higress :）
 
 ## Summary
 
@@ -76,10 +82,7 @@ docker run -d --rm --name higress-ai -v ${PWD}:/data \
 
 K8s 下使用 Helm 部署等其他安装方式可以参考官网 [Quick Start 文档](https://higress.cn/docs/latest/user/quickstart/)。
 
-如果您是在云上部署，生产环境推荐使用[企业版](https://higress.io/cloud/)，开发测试可以使用下面一键部署社区版：
-
-[![Deploy on AlibabaCloud ComputeNest](https://service-info-public.oss-cn-hangzhou.aliyuncs.com/computenest.svg)](https://computenest.console.aliyun.com/service/instance/create/default?type=user&ServiceName=Higress社区版)
-
+如果您是在云上部署，推荐使用[企业版](https://www.aliyun.com/product/apigateway?spm=higress-github.topbar.0.0.0)
 
 ## 使用场景
 

VERSION

@@ -1 +1 @@
-v2.1.6
+v2.1.9

api/cue.yaml

@@ -1,6 +1,6 @@
 # Cuelang configuration to generate OpenAPI schema for Higress configs.
 
-module: github.com/alibaba/higress/api
+module: github.com/alibaba/higress/v2/api
 
 openapi:
   selfContained: true

api/extensions/v1alpha1/wasmplugin.pb.go

@@ -41,6 +41,56 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// Route type for matching rules.
+// Extended by Higress
+type RouteType int32
+
+const (
+	// HTTP route (default)
+	RouteType_HTTP RouteType = 0
+	// GRPC route
+	RouteType_GRPC RouteType = 1
+)
+
+// Enum value maps for RouteType.
+var (
+	RouteType_name = map[int32]string{
+		0: "HTTP",
+		1: "GRPC",
+	}
+	RouteType_value = map[string]int32{
+		"HTTP": 0,
+		"GRPC": 1,
+	}
+)
+
+func (x RouteType) Enum() *RouteType {
+	p := new(RouteType)
+	*p = x
+	return p
+}
+
+func (x RouteType) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (RouteType) Descriptor() protoreflect.EnumDescriptor {
+	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0].Descriptor()
+}
+
+func (RouteType) Type() protoreflect.EnumType {
+	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0]
+}
+
+func (x RouteType) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use RouteType.Descriptor instead.
+func (RouteType) EnumDescriptor() ([]byte, []int) {
+	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{0}
+}
+
 // The phase in the filter chain where the plugin will be injected.
 type PluginPhase int32
 
@@ -84,11 +134,11 @@ func (x PluginPhase) String() string {
 }
 
 func (PluginPhase) Descriptor() protoreflect.EnumDescriptor {
-	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0].Descriptor()
+	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1].Descriptor()
 }
 
 func (PluginPhase) Type() protoreflect.EnumType {
-	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0]
+	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1]
 }
 
 func (x PluginPhase) Number() protoreflect.EnumNumber {
@@ -97,7 +147,7 @@ func (x PluginPhase) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use PluginPhase.Descriptor instead.
 func (PluginPhase) EnumDescriptor() ([]byte, []int) {
-	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{0}
+	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{1}
 }
 
 // The pull behaviour to be applied when fetching an OCI image,
@@ -146,11 +196,11 @@ func (x PullPolicy) String() string {
 }
 
 func (PullPolicy) Descriptor() protoreflect.EnumDescriptor {
-	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1].Descriptor()
+	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2].Descriptor()
 }
 
 func (PullPolicy) Type() protoreflect.EnumType {
-	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1]
+	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2]
 }
 
 func (x PullPolicy) Number() protoreflect.EnumNumber {
@@ -159,7 +209,7 @@ func (x PullPolicy) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use PullPolicy.Descriptor instead.
 func (PullPolicy) EnumDescriptor() ([]byte, []int) {
-	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{1}
+	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{2}
 }
 
 type EnvValueSource int32
@@ -194,11 +244,11 @@ func (x EnvValueSource) String() string {
 }
 
 func (EnvValueSource) Descriptor() protoreflect.EnumDescriptor {
-	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2].Descriptor()
+	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3].Descriptor()
 }
 
 func (EnvValueSource) Type() protoreflect.EnumType {
-	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2]
+	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3]
 }
 
 func (x EnvValueSource) Number() protoreflect.EnumNumber {
@@ -207,7 +257,7 @@ func (x EnvValueSource) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use EnvValueSource.Descriptor instead.
 func (EnvValueSource) EnumDescriptor() ([]byte, []int) {
-	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{2}
+	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{3}
 }
 
 type FailStrategy int32
@@ -246,11 +296,11 @@ func (x FailStrategy) String() string {
 }
 
 func (FailStrategy) Descriptor() protoreflect.EnumDescriptor {
-	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3].Descriptor()
+	return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[4].Descriptor()
 }
 
 func (FailStrategy) Type() protoreflect.EnumType {
-	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3]
+	return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[4]
 }
 
 func (x FailStrategy) Number() protoreflect.EnumNumber {
@@ -259,7 +309,7 @@ func (x FailStrategy) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use FailStrategy.Descriptor instead.
 func (FailStrategy) EnumDescriptor() ([]byte, []int) {
-	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{3}
+	return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{4}
 }
 
 // <!-- crd generation tags
@@ -485,6 +535,8 @@ type MatchRule struct {
 	Config        *_struct.Struct     `protobuf:"bytes,3,opt,name=config,proto3" json:"config,omitempty"`
 	ConfigDisable *wrappers.BoolValue `protobuf:"bytes,4,opt,name=config_disable,json=configDisable,proto3" json:"config_disable,omitempty"`
 	Service       []string            `protobuf:"bytes,5,rep,name=service,proto3" json:"service,omitempty"`
+	// Route type for this match rule, defaults to HTTP
+	RouteType RouteType `protobuf:"varint,6,opt,name=route_type,json=routeType,proto3,enum=higress.extensions.v1alpha1.RouteType" json:"route_type,omitempty"`
 }
 
 func (x *MatchRule) Reset() {
@@ -554,6 +606,13 @@ func (x *MatchRule) GetService() []string {
 	return nil
 }
 
+func (x *MatchRule) GetRouteType() RouteType {
+	if x != nil {
+		return x.RouteType
+	}
+	return RouteType_HTTP
+}
+
 // Configuration for a Wasm VM.
 // more details can be found [here](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/wasm/v3/wasm.proto#extensions-wasm-v3-vmconfig).
 type VmConfig struct {
@@ -736,7 +795,7 @@ var file_extensions_v1alpha1_wasmplugin_proto_rawDesc = []byte{
 	0x73, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x67, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
 	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x14, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xcb, 0x01,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x92, 0x02,
 	0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x69,
 	0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x69, 0x6e,
 	0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18,
@@ -749,37 +808,44 @@ var file_extensions_v1alpha1_wasmplugin_proto_rawDesc = []byte{
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
 	0x75, 0x65, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c,
 	0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x41, 0x0a, 0x08, 0x56,
-	0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x35, 0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68,
-	0x61, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x52, 0x03, 0x65, 0x6e, 0x76, 0x22, 0x7e,
-	0x0a, 0x06, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4a, 0x0a, 0x0a,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x2b, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x45,
-	0x6e, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x45,
-	0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x50, 0x68, 0x61, 0x73, 0x65, 0x12, 0x15, 0x0a,
-	0x11, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x5f, 0x50, 0x48, 0x41,
-	0x53, 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x55, 0x54, 0x48, 0x4e, 0x10, 0x01, 0x12,
-	0x09, 0x0a, 0x05, 0x41, 0x55, 0x54, 0x48, 0x5a, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54,
-	0x41, 0x54, 0x53, 0x10, 0x03, 0x2a, 0x42, 0x0a, 0x0a, 0x50, 0x75, 0x6c, 0x6c, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x12, 0x16, 0x0a, 0x12, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x49,
-	0x66, 0x4e, 0x6f, 0x74, 0x50, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x0a, 0x0a,
-	0x06, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x10, 0x02, 0x2a, 0x26, 0x0a, 0x0e, 0x45, 0x6e, 0x76,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x49,
-	0x4e, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10,
-	0x01, 0x2a, 0x2d, 0x0a, 0x0c, 0x46, 0x61, 0x69, 0x6c, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67,
-	0x79, 0x12, 0x0e, 0x0a, 0x0a, 0x46, 0x41, 0x49, 0x4c, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x10,
-	0x00, 0x12, 0x0d, 0x0a, 0x09, 0x46, 0x41, 0x49, 0x4c, 0x5f, 0x4f, 0x50, 0x45, 0x4e, 0x10, 0x01,
-	0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61,
-	0x6c, 0x69, 0x62, 0x61, 0x62, 0x61, 0x2f, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x61,
-	0x70, 0x69, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x31,
-	0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x28, 0x09, 0x52, 0x07, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x72,
+	0x6f, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x26, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x22, 0x41, 0x0a, 0x08, 0x56, 0x6d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x35,
+	0x0a, 0x03, 0x65, 0x6e, 0x76, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x68, 0x69,
+	0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x72,
+	0x52, 0x03, 0x65, 0x6e, 0x76, 0x22, 0x7e, 0x0a, 0x06, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x72, 0x12,
+	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x4a, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x66, 0x72, 0x6f,
+	0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73,
+	0x73, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x76, 0x31, 0x61,
+	0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x1f, 0x0a, 0x09, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04,
+	0x47, 0x52, 0x50, 0x43, 0x10, 0x01, 0x2a, 0x45, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e,
+	0x50, 0x68, 0x61, 0x73, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x5f, 0x50, 0x48, 0x41, 0x53, 0x45, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05,
+	0x41, 0x55, 0x54, 0x48, 0x4e, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x55, 0x54, 0x48, 0x5a,
+	0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x54, 0x53, 0x10, 0x03, 0x2a, 0x42, 0x0a,
+	0x0a, 0x50, 0x75, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x16, 0x0a, 0x12, 0x55,
+	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
+	0x59, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x49, 0x66, 0x4e, 0x6f, 0x74, 0x50, 0x72, 0x65, 0x73,
+	0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x10,
+	0x02, 0x2a, 0x26, 0x0a, 0x0e, 0x45, 0x6e, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x53, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x00, 0x12,
+	0x08, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x01, 0x2a, 0x2d, 0x0a, 0x0c, 0x46, 0x61, 0x69,
+	0x6c, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x12, 0x0e, 0x0a, 0x0a, 0x46, 0x41, 0x49,
+	0x4c, 0x5f, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x46, 0x41, 0x49,
+	0x4c, 0x5f, 0x4f, 0x50, 0x45, 0x4e, 0x10, 0x01, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61, 0x2f, 0x68,
+	0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61,
+	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -794,40 +860,42 @@ func file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP() []byte {
 	return file_extensions_v1alpha1_wasmplugin_proto_rawDescData
 }
 
-var file_extensions_v1alpha1_wasmplugin_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_extensions_v1alpha1_wasmplugin_proto_enumTypes = make([]protoimpl.EnumInfo, 5)
 var file_extensions_v1alpha1_wasmplugin_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_extensions_v1alpha1_wasmplugin_proto_goTypes = []interface{}{
-	(PluginPhase)(0),            // 0: higress.extensions.v1alpha1.PluginPhase
-	(PullPolicy)(0),             // 1: higress.extensions.v1alpha1.PullPolicy
-	(EnvValueSource)(0),         // 2: higress.extensions.v1alpha1.EnvValueSource
-	(FailStrategy)(0),           // 3: higress.extensions.v1alpha1.FailStrategy
-	(*WasmPlugin)(nil),          // 4: higress.extensions.v1alpha1.WasmPlugin
-	(*MatchRule)(nil),           // 5: higress.extensions.v1alpha1.MatchRule
-	(*VmConfig)(nil),            // 6: higress.extensions.v1alpha1.VmConfig
-	(*EnvVar)(nil),              // 7: higress.extensions.v1alpha1.EnvVar
-	(*_struct.Struct)(nil),      // 8: google.protobuf.Struct
-	(*wrappers.Int32Value)(nil), // 9: google.protobuf.Int32Value
-	(*wrappers.BoolValue)(nil),  // 10: google.protobuf.BoolValue
+	(RouteType)(0),              // 0: higress.extensions.v1alpha1.RouteType
+	(PluginPhase)(0),            // 1: higress.extensions.v1alpha1.PluginPhase
+	(PullPolicy)(0),             // 2: higress.extensions.v1alpha1.PullPolicy
+	(EnvValueSource)(0),         // 3: higress.extensions.v1alpha1.EnvValueSource
+	(FailStrategy)(0),           // 4: higress.extensions.v1alpha1.FailStrategy
+	(*WasmPlugin)(nil),          // 5: higress.extensions.v1alpha1.WasmPlugin
+	(*MatchRule)(nil),           // 6: higress.extensions.v1alpha1.MatchRule
+	(*VmConfig)(nil),            // 7: higress.extensions.v1alpha1.VmConfig
+	(*EnvVar)(nil),              // 8: higress.extensions.v1alpha1.EnvVar
+	(*_struct.Struct)(nil),      // 9: google.protobuf.Struct
+	(*wrappers.Int32Value)(nil), // 10: google.protobuf.Int32Value
+	(*wrappers.BoolValue)(nil),  // 11: google.protobuf.BoolValue
 }
 var file_extensions_v1alpha1_wasmplugin_proto_depIdxs = []int32{
-	1,  // 0: higress.extensions.v1alpha1.WasmPlugin.image_pull_policy:type_name -> higress.extensions.v1alpha1.PullPolicy
-	8,  // 1: higress.extensions.v1alpha1.WasmPlugin.plugin_config:type_name -> google.protobuf.Struct
-	0,  // 2: higress.extensions.v1alpha1.WasmPlugin.phase:type_name -> higress.extensions.v1alpha1.PluginPhase
-	9,  // 3: higress.extensions.v1alpha1.WasmPlugin.priority:type_name -> google.protobuf.Int32Value
-	3,  // 4: higress.extensions.v1alpha1.WasmPlugin.fail_strategy:type_name -> higress.extensions.v1alpha1.FailStrategy
-	6,  // 5: higress.extensions.v1alpha1.WasmPlugin.vm_config:type_name -> higress.extensions.v1alpha1.VmConfig
-	8,  // 6: higress.extensions.v1alpha1.WasmPlugin.default_config:type_name -> google.protobuf.Struct
-	5,  // 7: higress.extensions.v1alpha1.WasmPlugin.match_rules:type_name -> higress.extensions.v1alpha1.MatchRule
-	10, // 8: higress.extensions.v1alpha1.WasmPlugin.default_config_disable:type_name -> google.protobuf.BoolValue
-	8,  // 9: higress.extensions.v1alpha1.MatchRule.config:type_name -> google.protobuf.Struct
-	10, // 10: higress.extensions.v1alpha1.MatchRule.config_disable:type_name -> google.protobuf.BoolValue
-	7,  // 11: higress.extensions.v1alpha1.VmConfig.env:type_name -> higress.extensions.v1alpha1.EnvVar
-	2,  // 12: higress.extensions.v1alpha1.EnvVar.value_from:type_name -> higress.extensions.v1alpha1.EnvValueSource
-	13, // [13:13] is the sub-list for method output_type
-	13, // [13:13] is the sub-list for method input_type
-	13, // [13:13] is the sub-list for extension type_name
-	13, // [13:13] is the sub-list for extension extendee
-	0,  // [0:13] is the sub-list for field type_name
+	2,  // 0: higress.extensions.v1alpha1.WasmPlugin.image_pull_policy:type_name -> higress.extensions.v1alpha1.PullPolicy
+	9,  // 1: higress.extensions.v1alpha1.WasmPlugin.plugin_config:type_name -> google.protobuf.Struct
+	1,  // 2: higress.extensions.v1alpha1.WasmPlugin.phase:type_name -> higress.extensions.v1alpha1.PluginPhase
+	10, // 3: higress.extensions.v1alpha1.WasmPlugin.priority:type_name -> google.protobuf.Int32Value
+	4,  // 4: higress.extensions.v1alpha1.WasmPlugin.fail_strategy:type_name -> higress.extensions.v1alpha1.FailStrategy
+	7,  // 5: higress.extensions.v1alpha1.WasmPlugin.vm_config:type_name -> higress.extensions.v1alpha1.VmConfig
+	9,  // 6: higress.extensions.v1alpha1.WasmPlugin.default_config:type_name -> google.protobuf.Struct
+	6,  // 7: higress.extensions.v1alpha1.WasmPlugin.match_rules:type_name -> higress.extensions.v1alpha1.MatchRule
+	11, // 8: higress.extensions.v1alpha1.WasmPlugin.default_config_disable:type_name -> google.protobuf.BoolValue
+	9,  // 9: higress.extensions.v1alpha1.MatchRule.config:type_name -> google.protobuf.Struct
+	11, // 10: higress.extensions.v1alpha1.MatchRule.config_disable:type_name -> google.protobuf.BoolValue
+	0,  // 11: higress.extensions.v1alpha1.MatchRule.route_type:type_name -> higress.extensions.v1alpha1.RouteType
+	8,  // 12: higress.extensions.v1alpha1.VmConfig.env:type_name -> higress.extensions.v1alpha1.EnvVar
+	3,  // 13: higress.extensions.v1alpha1.EnvVar.value_from:type_name -> higress.extensions.v1alpha1.EnvValueSource
+	14, // [14:14] is the sub-list for method output_type
+	14, // [14:14] is the sub-list for method input_type
+	14, // [14:14] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for extension extendee
+	0,  // [0:14] is the sub-list for field type_name
 }
 
 func init() { file_extensions_v1alpha1_wasmplugin_proto_init() }
@@ -890,7 +958,7 @@ func file_extensions_v1alpha1_wasmplugin_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_extensions_v1alpha1_wasmplugin_proto_rawDesc,
-			NumEnums:      4,
+			NumEnums:      5,
 			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,

api/extensions/v1alpha1/wasmplugin.proto

@@ -24,7 +24,7 @@ import "google/protobuf/struct.proto";
 
 package higress.extensions.v1alpha1;
 
-option go_package="github.com/alibaba/higress/api/extensions/v1alpha1";
+option go_package="github.com/alibaba/higress/v2/api/extensions/v1alpha1";
 
 // <!-- crd generation tags
 // +cue-gen:WasmPlugin:groupName:extensions.higress.io
@@ -122,6 +122,18 @@ message MatchRule {
   google.protobuf.Struct config = 3;
   google.protobuf.BoolValue config_disable = 4;
   repeated string service = 5;
+  // Route type for this match rule, defaults to HTTP
+  RouteType route_type = 6;
+}
+
+// Route type for matching rules.
+// Extended by Higress
+enum RouteType {
+  // HTTP route (default)
+  HTTP = 0;
+  
+  // GRPC route
+  GRPC = 1;
 }
 
 // The phase in the filter chain where the plugin will be injected.

api/gen.sh

@@ -7,5 +7,5 @@ buf generate \
     --path networking \
     --path extensions
 
-# Generate CRDs 
+# Generate CRDs
 cue-gen -verbose -f=./cue.yaml -crd=true

api/kubernetes/customresourcedefinitions.gen.yaml

@@ -71,6 +71,11 @@ spec:
                       items:
                         type: string
                       type: array
+                    routeType:
+                      enum:
+                      - HTTP
+                      - GRPC
+                      type: string
                     service:
                       items:
                         type: string
@@ -247,6 +252,23 @@ spec:
         properties:
           spec:
             properties:
+              proxies:
+                items:
+                  properties:
+                    connectTimeout:
+                      type: integer
+                    listenerPort:
+                      type: integer
+                    name:
+                      type: string
+                    serverAddress:
+                      type: string
+                    serverPort:
+                      type: integer
+                    type:
+                      type: string
+                  type: object
+                type: array
               registries:
                 items:
                   properties:
@@ -309,10 +331,26 @@ spec:
                       type: integer
                     protocol:
                       type: string
+                    proxyName:
+                      type: string
                     sni:
                       type: string
                     type:
                       type: string
+                    vport:
+                      properties:
+                        default:
+                          type: integer
+                        services:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: integer
+                            type: object
+                          type: array
+                      type: object
                     zkServicesPath:
                       items:
                         type: string

api/networking/v1/http_2_rpc.pb.go

@@ -504,11 +504,11 @@ var file_networking_v1_http_2_rpc_proto_rawDesc = []byte{
 	0x69, 0x72, 0x65, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x22, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d,
 	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02,
 	0x52, 0x09, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x47,
-	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69,
+	0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69,
 	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61,
-	0x2f, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x65, 0x74,
-	0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x2f, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f,
+	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

api/networking/v1/http_2_rpc.proto

@@ -1,11 +1,11 @@
 // Copyright (c) 2022 Alibaba Group Holding Ltd.
-//  
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//  
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-//  
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ import "google/api/field_behavior.proto";
 
 package higress.networking.v1;
 
-option go_package = "github.com/alibaba/higress/api/networking/v1";
+option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
 
 // <!-- crd generation tags
 // +cue-gen:Http2Rpc:groupName:networking.higress.io

api/networking/v1/mcp_bridge.pb.go

@@ -65,6 +65,7 @@ type McpBridge struct {
 	unknownFields protoimpl.UnknownFields
 
 	Registries []*RegistryConfig `protobuf:"bytes,1,rep,name=registries,proto3" json:"registries,omitempty"`
+	Proxies    []*ProxyConfig    `protobuf:"bytes,2,rep,name=proxies,proto3" json:"proxies,omitempty"`
 }
 
 func (x *McpBridge) Reset() {
@@ -106,36 +107,45 @@ func (x *McpBridge) GetRegistries() []*RegistryConfig {
 	return nil
 }
 
+func (x *McpBridge) GetProxies() []*ProxyConfig {
+	if x != nil {
+		return x.Proxies
+	}
+	return nil
+}
+
 type RegistryConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Type                   string               `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
-	Name                   string               `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Domain                 string               `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
-	Port                   uint32               `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
-	NacosAddressServer     string               `protobuf:"bytes,5,opt,name=nacosAddressServer,proto3" json:"nacosAddressServer,omitempty"`
-	NacosAccessKey         string               `protobuf:"bytes,6,opt,name=nacosAccessKey,proto3" json:"nacosAccessKey,omitempty"`
-	NacosSecretKey         string               `protobuf:"bytes,7,opt,name=nacosSecretKey,proto3" json:"nacosSecretKey,omitempty"`
-	NacosNamespaceId       string               `protobuf:"bytes,8,opt,name=nacosNamespaceId,proto3" json:"nacosNamespaceId,omitempty"`
-	NacosNamespace         string               `protobuf:"bytes,9,opt,name=nacosNamespace,proto3" json:"nacosNamespace,omitempty"`
-	NacosGroups            []string             `protobuf:"bytes,10,rep,name=nacosGroups,proto3" json:"nacosGroups,omitempty"`
-	NacosRefreshInterval   int64                `protobuf:"varint,11,opt,name=nacosRefreshInterval,proto3" json:"nacosRefreshInterval,omitempty"`
-	ConsulNamespace        string               `protobuf:"bytes,12,opt,name=consulNamespace,proto3" json:"consulNamespace,omitempty"`
-	ZkServicesPath         []string             `protobuf:"bytes,13,rep,name=zkServicesPath,proto3" json:"zkServicesPath,omitempty"`
-	ConsulDatacenter       string               `protobuf:"bytes,14,opt,name=consulDatacenter,proto3" json:"consulDatacenter,omitempty"`
-	ConsulServiceTag       string               `protobuf:"bytes,15,opt,name=consulServiceTag,proto3" json:"consulServiceTag,omitempty"`
-	ConsulRefreshInterval  int64                `protobuf:"varint,16,opt,name=consulRefreshInterval,proto3" json:"consulRefreshInterval,omitempty"`
-	AuthSecretName         string               `protobuf:"bytes,17,opt,name=authSecretName,proto3" json:"authSecretName,omitempty"`
-	Protocol               string               `protobuf:"bytes,18,opt,name=protocol,proto3" json:"protocol,omitempty"`
-	Sni                    string               `protobuf:"bytes,19,opt,name=sni,proto3" json:"sni,omitempty"`
-	McpServerExportDomains []string             `protobuf:"bytes,20,rep,name=mcpServerExportDomains,proto3" json:"mcpServerExportDomains,omitempty"`
-	McpServerBaseUrl       string               `protobuf:"bytes,21,opt,name=mcpServerBaseUrl,proto3" json:"mcpServerBaseUrl,omitempty"`
-	EnableMCPServer        *wrappers.BoolValue  `protobuf:"bytes,22,opt,name=enableMCPServer,proto3" json:"enableMCPServer,omitempty"`
-	EnableScopeMcpServers  *wrappers.BoolValue  `protobuf:"bytes,23,opt,name=enableScopeMcpServers,proto3" json:"enableScopeMcpServers,omitempty"`
-	AllowMcpServers        []string             `protobuf:"bytes,24,rep,name=allowMcpServers,proto3" json:"allowMcpServers,omitempty"`
-	Metadata               map[string]*InnerMap `protobuf:"bytes,25,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Type                   string                `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Name                   string                `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Domain                 string                `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
+	Port                   uint32                `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"`
+	NacosAddressServer     string                `protobuf:"bytes,5,opt,name=nacosAddressServer,proto3" json:"nacosAddressServer,omitempty"`
+	NacosAccessKey         string                `protobuf:"bytes,6,opt,name=nacosAccessKey,proto3" json:"nacosAccessKey,omitempty"`
+	NacosSecretKey         string                `protobuf:"bytes,7,opt,name=nacosSecretKey,proto3" json:"nacosSecretKey,omitempty"`
+	NacosNamespaceId       string                `protobuf:"bytes,8,opt,name=nacosNamespaceId,proto3" json:"nacosNamespaceId,omitempty"`
+	NacosNamespace         string                `protobuf:"bytes,9,opt,name=nacosNamespace,proto3" json:"nacosNamespace,omitempty"`
+	NacosGroups            []string              `protobuf:"bytes,10,rep,name=nacosGroups,proto3" json:"nacosGroups,omitempty"`
+	NacosRefreshInterval   int64                 `protobuf:"varint,11,opt,name=nacosRefreshInterval,proto3" json:"nacosRefreshInterval,omitempty"`
+	ConsulNamespace        string                `protobuf:"bytes,12,opt,name=consulNamespace,proto3" json:"consulNamespace,omitempty"`
+	ZkServicesPath         []string              `protobuf:"bytes,13,rep,name=zkServicesPath,proto3" json:"zkServicesPath,omitempty"`
+	ConsulDatacenter       string                `protobuf:"bytes,14,opt,name=consulDatacenter,proto3" json:"consulDatacenter,omitempty"`
+	ConsulServiceTag       string                `protobuf:"bytes,15,opt,name=consulServiceTag,proto3" json:"consulServiceTag,omitempty"`
+	ConsulRefreshInterval  int64                 `protobuf:"varint,16,opt,name=consulRefreshInterval,proto3" json:"consulRefreshInterval,omitempty"`
+	AuthSecretName         string                `protobuf:"bytes,17,opt,name=authSecretName,proto3" json:"authSecretName,omitempty"`
+	Protocol               string                `protobuf:"bytes,18,opt,name=protocol,proto3" json:"protocol,omitempty"`
+	Sni                    string                `protobuf:"bytes,19,opt,name=sni,proto3" json:"sni,omitempty"`
+	McpServerExportDomains []string              `protobuf:"bytes,20,rep,name=mcpServerExportDomains,proto3" json:"mcpServerExportDomains,omitempty"`
+	McpServerBaseUrl       string                `protobuf:"bytes,21,opt,name=mcpServerBaseUrl,proto3" json:"mcpServerBaseUrl,omitempty"`
+	EnableMCPServer        *wrappers.BoolValue   `protobuf:"bytes,22,opt,name=enableMCPServer,proto3" json:"enableMCPServer,omitempty"`
+	EnableScopeMcpServers  *wrappers.BoolValue   `protobuf:"bytes,23,opt,name=enableScopeMcpServers,proto3" json:"enableScopeMcpServers,omitempty"`
+	AllowMcpServers        []string              `protobuf:"bytes,24,rep,name=allowMcpServers,proto3" json:"allowMcpServers,omitempty"`
+	Metadata               map[string]*InnerMap  `protobuf:"bytes,25,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ProxyName              string                `protobuf:"bytes,26,opt,name=proxyName,proto3" json:"proxyName,omitempty"`
+	Vport                  *RegistryConfig_VPort `protobuf:"bytes,27,opt,name=vport,proto3" json:"vport,omitempty"`
 }
 
 func (x *RegistryConfig) Reset() {
@@ -345,6 +355,107 @@ func (x *RegistryConfig) GetMetadata() map[string]*InnerMap {
 	return nil
 }
 
+func (x *RegistryConfig) GetProxyName() string {
+	if x != nil {
+		return x.ProxyName
+	}
+	return ""
+}
+
+func (x *RegistryConfig) GetVport() *RegistryConfig_VPort {
+	if x != nil {
+		return x.Vport
+	}
+	return nil
+}
+
+type ProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Type           string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Name           string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	ServerAddress  string `protobuf:"bytes,3,opt,name=serverAddress,proto3" json:"serverAddress,omitempty"`
+	ServerPort     uint32 `protobuf:"varint,4,opt,name=serverPort,proto3" json:"serverPort,omitempty"`
+	ListenerPort   uint32 `protobuf:"varint,5,opt,name=listenerPort,proto3" json:"listenerPort,omitempty"`
+	ConnectTimeout uint32 `protobuf:"varint,6,opt,name=connectTimeout,proto3" json:"connectTimeout,omitempty"`
+}
+
+func (x *ProxyConfig) Reset() {
+	*x = ProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ProxyConfig) ProtoMessage() {}
+
+func (x *ProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ProxyConfig.ProtoReflect.Descriptor instead.
+func (*ProxyConfig) Descriptor() ([]byte, []int) {
+	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *ProxyConfig) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *ProxyConfig) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ProxyConfig) GetServerAddress() string {
+	if x != nil {
+		return x.ServerAddress
+	}
+	return ""
+}
+
+func (x *ProxyConfig) GetServerPort() uint32 {
+	if x != nil {
+		return x.ServerPort
+	}
+	return 0
+}
+
+func (x *ProxyConfig) GetListenerPort() uint32 {
+	if x != nil {
+		return x.ListenerPort
+	}
+	return 0
+}
+
+func (x *ProxyConfig) GetConnectTimeout() uint32 {
+	if x != nil {
+		return x.ConnectTimeout
+	}
+	return 0
+}
+
 type InnerMap struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -356,7 +467,7 @@ type InnerMap struct {
 func (x *InnerMap) Reset() {
 	*x = InnerMap{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
+		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -369,7 +480,7 @@ func (x *InnerMap) String() string {
 func (*InnerMap) ProtoMessage() {}
 
 func (x *InnerMap) ProtoReflect() protoreflect.Message {
-	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[2]
+	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -382,7 +493,7 @@ func (x *InnerMap) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InnerMap.ProtoReflect.Descriptor instead.
 func (*InnerMap) Descriptor() ([]byte, []int) {
-	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{2}
+	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *InnerMap) GetInnerMap() map[string]string {
@@ -392,6 +503,116 @@ func (x *InnerMap) GetInnerMap() map[string]string {
 	return nil
 }
 
+type RegistryConfig_VPort struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Default  uint32                           `protobuf:"varint,1,opt,name=default,proto3" json:"default,omitempty"`
+	Services []*RegistryConfig_VPort_Services `protobuf:"bytes,2,rep,name=services,proto3" json:"services,omitempty"`
+}
+
+func (x *RegistryConfig_VPort) Reset() {
+	*x = RegistryConfig_VPort{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RegistryConfig_VPort) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegistryConfig_VPort) ProtoMessage() {}
+
+func (x *RegistryConfig_VPort) ProtoReflect() protoreflect.Message {
+	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegistryConfig_VPort.ProtoReflect.Descriptor instead.
+func (*RegistryConfig_VPort) Descriptor() ([]byte, []int) {
+	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{1, 1}
+}
+
+func (x *RegistryConfig_VPort) GetDefault() uint32 {
+	if x != nil {
+		return x.Default
+	}
+	return 0
+}
+
+func (x *RegistryConfig_VPort) GetServices() []*RegistryConfig_VPort_Services {
+	if x != nil {
+		return x.Services
+	}
+	return nil
+}
+
+type RegistryConfig_VPort_Services struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name  string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Value uint32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
+}
+
+func (x *RegistryConfig_VPort_Services) Reset() {
+	*x = RegistryConfig_VPort_Services{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_networking_v1_mcp_bridge_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RegistryConfig_VPort_Services) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegistryConfig_VPort_Services) ProtoMessage() {}
+
+func (x *RegistryConfig_VPort_Services) ProtoReflect() protoreflect.Message {
+	mi := &file_networking_v1_mcp_bridge_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegistryConfig_VPort_Services.ProtoReflect.Descriptor instead.
+func (*RegistryConfig_VPort_Services) Descriptor() ([]byte, []int) {
+	return file_networking_v1_mcp_bridge_proto_rawDescGZIP(), []int{1, 1, 0}
+}
+
+func (x *RegistryConfig_VPort_Services) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *RegistryConfig_VPort_Services) GetValue() uint32 {
+	if x != nil {
+		return x.Value
+	}
+	return 0
+}
+
 var File_networking_v1_mcp_bridge_proto protoreflect.FileDescriptor
 
 var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
@@ -404,100 +625,134 @@ var file_networking_v1_mcp_bridge_proto_rawDesc = []byte{
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
 	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x52, 0x0a, 0x09, 0x4d, 0x63, 0x70, 0x42, 0x72, 0x69,
-	0x64, 0x67, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73,
-	0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e,
-	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a,
-	0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x22, 0xa8, 0x09, 0x0a, 0x0e, 0x52,
-	0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02,
-	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f,
-	0x6d, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
-	0x06, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74,
-	0x12, 0x2e, 0x0a, 0x12, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x61,
-	0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b,
-	0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f,
-	0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79,
-	0x12, 0x2a, 0x0a, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x61, 0x63, 0x6f,
-	0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e,
-	0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52,
-	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0b,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65,
-	0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f,
-	0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x0c, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x7a, 0x6b,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2a, 0x0a, 0x10,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61,
-	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x0f, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x54, 0x61, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x10, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65,
-	0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x75,
-	0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x12,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x10,
-	0x0a, 0x03, 0x73, 0x6e, 0x69, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x6e, 0x69,
-	0x12, 0x36, 0x0a, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70,
-	0x6f, 0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6d, 0x63, 0x70, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x15, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73,
-	0x65, 0x55, 0x72, 0x6c, 0x12, 0x44, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x43,
-	0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x4d, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x50, 0x0a, 0x15, 0x65, 0x6e,
-	0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f,
-	0x70, 0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x0f,
-	0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18,
-	0x18, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x01, 0x0a, 0x09, 0x4d, 0x63, 0x70, 0x42, 0x72,
+	0x69, 0x64, 0x67, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65,
 	0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31,
-	0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x5c, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x0a, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x07, 0x70,
+	0x72, 0x6f, 0x78, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x68,
+	0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e,
+	0x67, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x07, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x65, 0x73, 0x22, 0xb5, 0x0b, 0x0a, 0x0e, 0x52, 0x65,
+	0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x06, 0x64, 0x6f, 0x6d,
+	0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x06,
+	0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12,
+	0x2e, 0x0a, 0x12, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6e, 0x61, 0x63,
+	0x6f, 0x73, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12,
+	0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65,
+	0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x41, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73,
+	0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12,
+	0x2a, 0x0a, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63,
+	0x65, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x61, 0x63, 0x6f, 0x73,
+	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x6e,
+	0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47, 0x72, 0x6f, 0x75,
+	0x70, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x47,
+	0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x14, 0x6e, 0x61, 0x63, 0x6f, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f, 0x6e,
+	0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x73, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x7a, 0x6b, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2a, 0x0a, 0x10, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x44, 0x61, 0x74,
+	0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75,
+	0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x54, 0x61, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x10, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x15, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x75, 0x74,
+	0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x61, 0x75, 0x74, 0x68, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x10, 0x0a,
+	0x03, 0x73, 0x6e, 0x69, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x6e, 0x69, 0x12,
+	0x36, 0x0a, 0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f,
+	0x72, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x14, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x16, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
+	0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x10, 0x6d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x73, 0x65,
+	0x55, 0x72, 0x6c, 0x12, 0x44, 0x0a, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x43, 0x50,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
+	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x4d, 0x43, 0x50, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x50, 0x0a, 0x15, 0x65, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x63, 0x6f, 0x70,
+	0x65, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x61,
+	0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x18, 0x18,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4d, 0x63, 0x70, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x73, 0x12, 0x4f, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73,
+	0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e,
+	0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4d,
+	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x41, 0x0a, 0x05, 0x76, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x1b, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x56, 0x50, 0x6f, 0x72, 0x74,
+	0x52, 0x05, 0x76, 0x70, 0x6f, 0x72, 0x74, 0x1a, 0x5c, 0x0a, 0x0d, 0x4d, 0x65, 0x74, 0x61, 0x64,
 	0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x35, 0x0a, 0x05, 0x76, 0x61,
 	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x68, 0x69, 0x67, 0x72,
 	0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76,
 	0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x93, 0x01, 0x0a, 0x08, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d,
-	0x61, 0x70, 0x12, 0x4a, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x70, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e,
-	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e,
-	0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x1a, 0x3b,
-	0x0a, 0x0d, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2e, 0x5a, 0x2c, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62,
-	0x61, 0x2f, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0xa9, 0x01, 0x0a, 0x05, 0x56, 0x50, 0x6f, 0x72, 0x74, 0x12,
+	0x18, 0x0a, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x07, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x50, 0x0a, 0x08, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x68, 0x69,
+	0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x69, 0x6e, 0x67,
+	0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x56, 0x50, 0x6f, 0x72, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x73, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x1a, 0x34, 0x0a, 0x08, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x22, 0xdb, 0x01, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64,
+	0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52,
+	0x0d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x23,
+	0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0d, 0x42, 0x03, 0xe0, 0x41, 0x02, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50,
+	0x6f, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50,
+	0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6c, 0x69, 0x73, 0x74, 0x65,
+	0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
+	0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52,
+	0x0e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22,
+	0x93, 0x01, 0x0a, 0x08, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x12, 0x4a, 0x0a, 0x09,
+	0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x2d, 0x2e, 0x68, 0x69, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70,
+	0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
+	0x69, 0x6e, 0x6e, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x49, 0x6e, 0x6e, 0x65,
+	0x72, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x6c, 0x69, 0x62, 0x61, 0x62, 0x61, 0x2f, 0x68, 0x69, 0x67, 0x72,
+	0x65, 0x73, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f,
+	0x72, 0x6b, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -512,27 +767,33 @@ func file_networking_v1_mcp_bridge_proto_rawDescGZIP() []byte {
 	return file_networking_v1_mcp_bridge_proto_rawDescData
 }
 
-var file_networking_v1_mcp_bridge_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_networking_v1_mcp_bridge_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_networking_v1_mcp_bridge_proto_goTypes = []interface{}{
-	(*McpBridge)(nil),          // 0: higress.networking.v1.McpBridge
-	(*RegistryConfig)(nil),     // 1: higress.networking.v1.RegistryConfig
-	(*InnerMap)(nil),           // 2: higress.networking.v1.InnerMap
-	nil,                        // 3: higress.networking.v1.RegistryConfig.MetadataEntry
-	nil,                        // 4: higress.networking.v1.InnerMap.InnerMapEntry
-	(*wrappers.BoolValue)(nil), // 5: google.protobuf.BoolValue
+	(*McpBridge)(nil),                     // 0: higress.networking.v1.McpBridge
+	(*RegistryConfig)(nil),                // 1: higress.networking.v1.RegistryConfig
+	(*ProxyConfig)(nil),                   // 2: higress.networking.v1.ProxyConfig
+	(*InnerMap)(nil),                      // 3: higress.networking.v1.InnerMap
+	nil,                                   // 4: higress.networking.v1.RegistryConfig.MetadataEntry
+	(*RegistryConfig_VPort)(nil),          // 5: higress.networking.v1.RegistryConfig.VPort
+	(*RegistryConfig_VPort_Services)(nil), // 6: higress.networking.v1.RegistryConfig.VPort.Services
+	nil,                                   // 7: higress.networking.v1.InnerMap.InnerMapEntry
+	(*wrappers.BoolValue)(nil),            // 8: google.protobuf.BoolValue
 }
 var file_networking_v1_mcp_bridge_proto_depIdxs = []int32{
 	1, // 0: higress.networking.v1.McpBridge.registries:type_name -> higress.networking.v1.RegistryConfig
-	5, // 1: higress.networking.v1.RegistryConfig.enableMCPServer:type_name -> google.protobuf.BoolValue
-	5, // 2: higress.networking.v1.RegistryConfig.enableScopeMcpServers:type_name -> google.protobuf.BoolValue
-	3, // 3: higress.networking.v1.RegistryConfig.metadata:type_name -> higress.networking.v1.RegistryConfig.MetadataEntry
-	4, // 4: higress.networking.v1.InnerMap.inner_map:type_name -> higress.networking.v1.InnerMap.InnerMapEntry
-	2, // 5: higress.networking.v1.RegistryConfig.MetadataEntry.value:type_name -> higress.networking.v1.InnerMap
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
+	2, // 1: higress.networking.v1.McpBridge.proxies:type_name -> higress.networking.v1.ProxyConfig
+	8, // 2: higress.networking.v1.RegistryConfig.enableMCPServer:type_name -> google.protobuf.BoolValue
+	8, // 3: higress.networking.v1.RegistryConfig.enableScopeMcpServers:type_name -> google.protobuf.BoolValue
+	4, // 4: higress.networking.v1.RegistryConfig.metadata:type_name -> higress.networking.v1.RegistryConfig.MetadataEntry
+	5, // 5: higress.networking.v1.RegistryConfig.vport:type_name -> higress.networking.v1.RegistryConfig.VPort
+	7, // 6: higress.networking.v1.InnerMap.inner_map:type_name -> higress.networking.v1.InnerMap.InnerMapEntry
+	3, // 7: higress.networking.v1.RegistryConfig.MetadataEntry.value:type_name -> higress.networking.v1.InnerMap
+	6, // 8: higress.networking.v1.RegistryConfig.VPort.services:type_name -> higress.networking.v1.RegistryConfig.VPort.Services
+	9, // [9:9] is the sub-list for method output_type
+	9, // [9:9] is the sub-list for method input_type
+	9, // [9:9] is the sub-list for extension type_name
+	9, // [9:9] is the sub-list for extension extendee
+	0, // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_networking_v1_mcp_bridge_proto_init() }
@@ -566,6 +827,18 @@ func file_networking_v1_mcp_bridge_proto_init() {
 			}
 		}
 		file_networking_v1_mcp_bridge_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_networking_v1_mcp_bridge_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InnerMap); i {
 			case 0:
 				return &v.state
@@ -577,6 +850,30 @@ func file_networking_v1_mcp_bridge_proto_init() {
 				return nil
 			}
 		}
+		file_networking_v1_mcp_bridge_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RegistryConfig_VPort); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_networking_v1_mcp_bridge_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RegistryConfig_VPort_Services); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -584,7 +881,7 @@ func file_networking_v1_mcp_bridge_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_networking_v1_mcp_bridge_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

api/networking/v1/mcp_bridge.proto

@@ -1,11 +1,11 @@
 // Copyright (c) 2022 Alibaba Group Holding Ltd.
-//  
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-//  
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
-//  
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import "google/protobuf/struct.proto";
 
 package higress.networking.v1;
 
-option go_package = "github.com/alibaba/higress/api/networking/v1";
+option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
 
 // <!-- crd generation tags
 // +cue-gen:McpBridge:groupName:networking.higress.io
@@ -46,10 +46,11 @@ option go_package = "github.com/alibaba/higress/api/networking/v1";
 // -->
 message McpBridge {
   repeated RegistryConfig registries = 1;
+  repeated ProxyConfig proxies = 2;
 }
 
 message RegistryConfig {
-  string type = 1 [(google.api.field_behavior) = REQUIRED]; 
+  string type = 1 [(google.api.field_behavior) = REQUIRED];
   string name = 2;
   string domain = 3 [(google.api.field_behavior) = REQUIRED];
   uint32 port = 4 [(google.api.field_behavior) = REQUIRED];
@@ -74,6 +75,25 @@ message RegistryConfig {
   google.protobuf.BoolValue enableScopeMcpServers = 23;
   repeated string allowMcpServers = 24;
   map<string, InnerMap> metadata = 25;
+  string proxyName = 26;
+  message VPort {
+    uint32 default = 1;
+    message Services {
+      string name = 1;
+      uint32 value = 2;
+    }
+    repeated Services services = 2;
+  }
+  VPort vport = 27;
+}
+
+message ProxyConfig {
+  string type = 1 [(google.api.field_behavior) = REQUIRED];
+  string name = 2 [(google.api.field_behavior) = REQUIRED];
+  string serverAddress = 3 [(google.api.field_behavior) = REQUIRED];
+  uint32 serverPort = 4 [(google.api.field_behavior) = REQUIRED];
+  uint32 listenerPort = 5;
+  uint32 connectTimeout = 6;
 }
 
 message InnerMap {

api/networking/v1/mcp_bridge_deepcopy.gen.go

@@ -47,6 +47,69 @@ func (in *RegistryConfig) DeepCopyInterface() interface{} {
 	return in.DeepCopy()
 }
 
+// DeepCopyInto supports using RegistryConfig_VPort within kubernetes types, where deepcopy-gen is used.
+func (in *RegistryConfig_VPort) DeepCopyInto(out *RegistryConfig_VPort) {
+	p := proto.Clone(in).(*RegistryConfig_VPort)
+	*out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort. Required by controller-gen.
+func (in *RegistryConfig_VPort) DeepCopy() *RegistryConfig_VPort {
+	if in == nil {
+		return nil
+	}
+	out := new(RegistryConfig_VPort)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort. Required by controller-gen.
+func (in *RegistryConfig_VPort) DeepCopyInterface() interface{} {
+	return in.DeepCopy()
+}
+
+// DeepCopyInto supports using RegistryConfig_VPort_Services within kubernetes types, where deepcopy-gen is used.
+func (in *RegistryConfig_VPort_Services) DeepCopyInto(out *RegistryConfig_VPort_Services) {
+	p := proto.Clone(in).(*RegistryConfig_VPort_Services)
+	*out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort_Services. Required by controller-gen.
+func (in *RegistryConfig_VPort_Services) DeepCopy() *RegistryConfig_VPort_Services {
+	if in == nil {
+		return nil
+	}
+	out := new(RegistryConfig_VPort_Services)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new RegistryConfig_VPort_Services. Required by controller-gen.
+func (in *RegistryConfig_VPort_Services) DeepCopyInterface() interface{} {
+	return in.DeepCopy()
+}
+
+// DeepCopyInto supports using ProxyConfig within kubernetes types, where deepcopy-gen is used.
+func (in *ProxyConfig) DeepCopyInto(out *ProxyConfig) {
+	p := proto.Clone(in).(*ProxyConfig)
+	*out = *p
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyConfig. Required by controller-gen.
+func (in *ProxyConfig) DeepCopy() *ProxyConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxyConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ProxyConfig. Required by controller-gen.
+func (in *ProxyConfig) DeepCopyInterface() interface{} {
+	return in.DeepCopy()
+}
+
 // DeepCopyInto supports using InnerMap within kubernetes types, where deepcopy-gen is used.
 func (in *InnerMap) DeepCopyInto(out *InnerMap) {
 	p := proto.Clone(in).(*InnerMap)

api/networking/v1/mcp_bridge_json.gen.go

@@ -28,6 +28,39 @@ func (this *RegistryConfig) UnmarshalJSON(b []byte) error {
 	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
 }
 
+// MarshalJSON is a custom marshaler for RegistryConfig_VPort
+func (this *RegistryConfig_VPort) MarshalJSON() ([]byte, error) {
+	str, err := McpBridgeMarshaler.MarshalToString(this)
+	return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for RegistryConfig_VPort
+func (this *RegistryConfig_VPort) UnmarshalJSON(b []byte) error {
+	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
+// MarshalJSON is a custom marshaler for RegistryConfig_VPort_Services
+func (this *RegistryConfig_VPort_Services) MarshalJSON() ([]byte, error) {
+	str, err := McpBridgeMarshaler.MarshalToString(this)
+	return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for RegistryConfig_VPort_Services
+func (this *RegistryConfig_VPort_Services) UnmarshalJSON(b []byte) error {
+	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
+// MarshalJSON is a custom marshaler for ProxyConfig
+func (this *ProxyConfig) MarshalJSON() ([]byte, error) {
+	str, err := McpBridgeMarshaler.MarshalToString(this)
+	return []byte(str), err
+}
+
+// UnmarshalJSON is a custom unmarshaler for ProxyConfig
+func (this *ProxyConfig) UnmarshalJSON(b []byte) error {
+	return McpBridgeUnmarshaler.Unmarshal(bytes.NewReader(b), this)
+}
+
 // MarshalJSON is a custom marshaler for InnerMap
 func (this *InnerMap) MarshalJSON() ([]byte, error) {
 	str, err := McpBridgeMarshaler.MarshalToString(this)

client/Makefile

@@ -29,12 +29,12 @@ comma := ,
 
 # source packages to scan for kubetype-gen tags
 kube_source_packages = $(subst $(space),$(empty), \
-	github.com/alibaba/higress/api/networking/v1, \
-	github.com/alibaba/higress/api/extensions/v1alpha1 \
+	github.com/alibaba/higress/v2/api/networking/v1, \
+	github.com/alibaba/higress/v2/api/extensions/v1alpha1 \
 	)
 
 # base output package for generated files
-kube_base_output_package = github.com/alibaba/higress/client/pkg
+kube_base_output_package = github.com/alibaba/higress/v2/client/pkg
 # base output package for kubernetes types, register, etc...
 kube_api_base_package = $(kube_base_output_package)/apis
 # source packages to scan for kubernetes generator tags, e.g. deepcopy-gen, client-gen, etc.
@@ -72,7 +72,7 @@ else
 endif
 
 rename_generated_files=\
-	find $(subst github.com/alibaba/higress/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
+	find $(subst github.com/alibaba/higress/v2/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
 	-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;
 
 .PHONY: generate-k8s-client
@@ -95,6 +95,6 @@ generate-k8s-client:
 
 
 .PHONY: clean-k8s-client
-clean-k8s-cliennt:
+clean-k8s-client:
     # remove generated code
 	@rm -rf pkg/

client/pkg/apis/extensions/v1alpha1/types.gen.go

@@ -17,7 +17,7 @@
 package v1alpha1
 
 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/api/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/api/extensions/v1alpha1"
 	metav1alpha1 "istio.io/api/meta/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

client/pkg/apis/networking/v1/types.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

client/pkg/applyconfiguration/extensions/v1alpha1/wasmplugin.go

@@ -17,8 +17,8 @@
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/alibaba/higress/api/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	v1alpha1 "github.com/alibaba/higress/v2/api/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
 	metav1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"

client/pkg/applyconfiguration/networking/v1/http2rpc.go

@@ -17,8 +17,8 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"

client/pkg/applyconfiguration/networking/v1/mcpbridge.go

@@ -17,8 +17,8 @@
 package v1
 
 import (
-	networkingv1 "github.com/alibaba/higress/api/networking/v1"
-	v1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
+	networkingv1 "github.com/alibaba/higress/v2/api/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
 	v1alpha1 "istio.io/api/meta/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"

client/pkg/applyconfiguration/utils.go

@@ -17,11 +17,11 @@
 package applyconfiguration
 
 import (
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
-	metav1 "github.com/alibaba/higress/client/pkg/applyconfiguration/meta/v1"
-	applyconfigurationnetworkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
+	metav1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/meta/v1"
+	applyconfigurationnetworkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )

client/pkg/clientset/versioned/clientset.gen.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net/http"
 
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"

client/pkg/clientset/versioned/fake/clientset_generated.gen.go

@@ -17,11 +17,11 @@
 package fake
 
 import (
-	clientset "github.com/alibaba/higress/client/pkg/clientset/versioned"
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
-	fakeextensionsv1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake"
-	networkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
-	fakenetworkingv1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1/fake"
+	clientset "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	fakeextensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
+	fakenetworkingv1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"

client/pkg/clientset/versioned/fake/register.gen.go

@@ -17,8 +17,8 @@
 package fake
 
 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,8 +26,10 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
-var scheme = runtime.NewScheme()
-var codecs = serializer.NewCodecFactory(scheme)
+var (
+	scheme = runtime.NewScheme()
+	codecs = serializer.NewCodecFactory(scheme)
+)
 
 var localSchemeBuilder = runtime.SchemeBuilder{
 	extensionsv1alpha1.AddToScheme,

client/pkg/clientset/versioned/scheme/register.gen.go

@@ -17,8 +17,8 @@
 package scheme
 
 import (
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,13 +26,15 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
-var Scheme = runtime.NewScheme()
-var Codecs = serializer.NewCodecFactory(Scheme)
-var ParameterCodec = runtime.NewParameterCodec(Scheme)
-var localSchemeBuilder = runtime.SchemeBuilder{
-	extensionsv1alpha1.AddToScheme,
-	networkingv1.AddToScheme,
-}
+var (
+	Scheme             = runtime.NewScheme()
+	Codecs             = serializer.NewCodecFactory(Scheme)
+	ParameterCodec     = runtime.NewParameterCodec(Scheme)
+	localSchemeBuilder = runtime.SchemeBuilder{
+		extensionsv1alpha1.AddToScheme,
+		networkingv1.AddToScheme,
+	}
+)
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:

client/pkg/clientset/versioned/typed/extensions/v1alpha1/extensions_client.gen.go

@@ -19,8 +19,8 @@ package v1alpha1
 import (
 	"net/http"
 
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 

client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_extensions_client.gen.go

@@ -17,7 +17,7 @@
 package fake
 
 import (
-	v1alpha1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/extensions/v1alpha1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )

client/pkg/clientset/versioned/typed/extensions/v1alpha1/fake/fake_wasmplugin.gen.go

@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"
 
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,7 +77,6 @@ func (c *FakeWasmPlugins) List(ctx context.Context, opts v1.ListOptions) (result
 func (c *FakeWasmPlugins) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(wasmpluginsResource, c.ns, opts))
-
 }
 
 // Create takes the representation of a wasmPlugin and creates it.  Returns the server's representation of the wasmPlugin, and an error, if there is any.

client/pkg/clientset/versioned/typed/extensions/v1alpha1/wasmplugin.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/applyconfiguration/extensions/v1alpha1"
-	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/extensions/v1alpha1"
+	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/clientset/versioned/typed/networking/v1/fake/fake_http2rpc.gen.go

@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"
 
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,7 +77,6 @@ func (c *FakeHttp2Rpcs) List(ctx context.Context, opts metav1.ListOptions) (resu
 func (c *FakeHttp2Rpcs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(http2rpcsResource, c.ns, opts))
-
 }
 
 // Create takes the representation of a http2Rpc and creates it.  Returns the server's representation of the http2Rpc, and an error, if there is any.

client/pkg/clientset/versioned/typed/networking/v1/fake/fake_mcpbridge.gen.go

@@ -21,8 +21,8 @@ import (
 	json "encoding/json"
 	"fmt"
 
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	types "k8s.io/apimachinery/pkg/types"
@@ -77,7 +77,6 @@ func (c *FakeMcpBridges) List(ctx context.Context, opts metav1.ListOptions) (res
 func (c *FakeMcpBridges) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
 		InvokesWatch(testing.NewWatchAction(mcpbridgesResource, c.ns, opts))
-
 }
 
 // Create takes the representation of a mcpBridge and creates it.  Returns the server's representation of the mcpBridge, and an error, if there is any.

client/pkg/clientset/versioned/typed/networking/v1/fake/fake_networking_client.gen.go

@@ -17,7 +17,7 @@
 package fake
 
 import (
-	v1 "github.com/alibaba/higress/client/pkg/clientset/versioned/typed/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/typed/networking/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )

client/pkg/clientset/versioned/typed/networking/v1/http2rpc.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
-	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
+	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/clientset/versioned/typed/networking/v1/mcpbridge.gen.go

@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"time"
 
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	networkingv1 "github.com/alibaba/higress/client/pkg/applyconfiguration/networking/v1"
-	scheme "github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/applyconfiguration/networking/v1"
+	scheme "github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/clientset/versioned/typed/networking/v1/networking_client.gen.go

@@ -19,8 +19,8 @@ package v1
 import (
 	"net/http"
 
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	"github.com/alibaba/higress/client/pkg/clientset/versioned/scheme"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	"github.com/alibaba/higress/v2/client/pkg/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 

client/pkg/informers/externalversions/extensions/interface.gen.go

@@ -17,8 +17,8 @@
 package extensions
 
 import (
-	v1alpha1 "github.com/alibaba/higress/client/pkg/informers/externalversions/extensions/v1alpha1"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/extensions/v1alpha1"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to each of this group's versions.

client/pkg/informers/externalversions/extensions/v1alpha1/interface.gen.go

@@ -17,7 +17,7 @@
 package v1alpha1
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

client/pkg/informers/externalversions/extensions/v1alpha1/wasmplugin.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	extensionsv1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	v1alpha1 "github.com/alibaba/higress/client/pkg/listers/extensions/v1alpha1"
+	extensionsv1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/listers/extensions/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/informers/externalversions/factory.gen.go

@@ -21,10 +21,10 @@ import (
 	sync "sync"
 	time "time"
 
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
-	extensions "github.com/alibaba/higress/client/pkg/informers/externalversions/extensions"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	networking "github.com/alibaba/higress/client/pkg/informers/externalversions/networking"
+	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	extensions "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/extensions"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	networking "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/networking"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"

client/pkg/informers/externalversions/generic.gen.go

@@ -19,8 +19,8 @@ package externalversions
 import (
 	"fmt"
 
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )

client/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go

@@ -19,7 +19,7 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
+	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"

client/pkg/informers/externalversions/networking/interface.gen.go

@@ -17,8 +17,8 @@
 package networking
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/client/pkg/informers/externalversions/networking/v1"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/networking/v1"
 )
 
 // Interface provides access to each of this group's versions.

client/pkg/informers/externalversions/networking/v1/http2rpc.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/client/pkg/listers/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/v2/client/pkg/listers/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/informers/externalversions/networking/v1/interface.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.

client/pkg/informers/externalversions/networking/v1/mcpbridge.gen.go

@@ -20,10 +20,10 @@ import (
 	"context"
 	time "time"
 
-	networkingv1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
-	versioned "github.com/alibaba/higress/client/pkg/clientset/versioned"
-	internalinterfaces "github.com/alibaba/higress/client/pkg/informers/externalversions/internalinterfaces"
-	v1 "github.com/alibaba/higress/client/pkg/listers/networking/v1"
+	networkingv1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
+	versioned "github.com/alibaba/higress/v2/client/pkg/clientset/versioned"
+	internalinterfaces "github.com/alibaba/higress/v2/client/pkg/informers/externalversions/internalinterfaces"
+	v1 "github.com/alibaba/higress/v2/client/pkg/listers/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"

client/pkg/listers/extensions/v1alpha1/wasmplugin.gen.go

@@ -17,7 +17,7 @@
 package v1alpha1
 
 import (
-	v1alpha1 "github.com/alibaba/higress/client/pkg/apis/extensions/v1alpha1"
+	v1alpha1 "github.com/alibaba/higress/v2/client/pkg/apis/extensions/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"

client/pkg/listers/networking/v1/http2rpc.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"

client/pkg/listers/networking/v1/mcpbridge.gen.go

@@ -17,7 +17,7 @@
 package v1
 
 import (
-	v1 "github.com/alibaba/higress/client/pkg/apis/networking/v1"
+	v1 "github.com/alibaba/higress/v2/client/pkg/apis/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"

cmd/higress/main.go

@@ -20,7 +20,7 @@ import (
 
 	"istio.io/pkg/log"
 
-	"github.com/alibaba/higress/pkg/cmd"
+	"github.com/alibaba/higress/v2/pkg/cmd"
 )
 
 func main() {

docker/Dockerfile.higress

@@ -6,13 +6,14 @@ ARG BASE_VERSION=latest
 
 ARG HUB
 
-# The following section is used as base image if BASE_DISTRIBUTION=debug
-# This base image is provided by istio, see: https://github.com/istio/istio/blob/master/docker/Dockerfile.base
-FROM ${HUB}/base:${BASE_VERSION}
-
 ARG TARGETARCH
 
-COPY ${TARGETARCH:-amd64}/higress /usr/local/bin/higress
+# The following section is used as base image if BASE_DISTRIBUTION=debug
+# This base image is provided by istio, see: https://github.com/istio/istio/blob/master/docker/Dockerfile.base
+FROM ${HUB}/base:${BASE_VERSION}-${TARGETARCH}
+
+ARG TARGETARCH
+COPY ${TARGETARCH}/higress /usr/local/bin/higress
 
 USER 1337:1337
 

docker/docker.mk

@@ -17,6 +17,11 @@ docker.higress: $(OUT_LINUX)/higress
 docker.higress: docker/Dockerfile.higress
 	$(HIGRESS_DOCKER_RULE)
 
+docker.higress-amd64: BUILD_ARGS=--build-arg BASE_VERSION=${HIGRESS_BASE_VERSION} --build-arg HUB=${HUB}
+docker.higress-amd64: $(AMD64_OUT_LINUX)/higress
+docker.higress-amd64: docker/Dockerfile.higress
+	$(HIGRESS_DOCKER_AMD64_RULE)
+
 docker.higress-buildx: BUILD_ARGS=--build-arg BASE_VERSION=${HIGRESS_BASE_VERSION} --build-arg HUB=${HUB}
 docker.higress-buildx: $(AMD64_OUT_LINUX)/higress
 docker.higress-buildx: $(ARM64_OUT_LINUX)/higress
@@ -40,3 +45,4 @@ IMG_URL ?= $(HUB)/$(IMG):$(TAG)
 
 HIGRESS_DOCKER_BUILDX_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=$(TARGET_ARCH) ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker buildx create --name higress --node higress0 --platform linux/amd64,linux/arm64 --use && docker buildx build --no-cache --platform linux/amd64,linux/arm64 $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . --push  ); )
 HIGRESS_DOCKER_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=$(TARGET_ARCH) ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker build $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . ); )
+HIGRESS_DOCKER_AMD64_RULE ?= $(foreach VARIANT,$(DOCKER_BUILD_VARIANTS), time (mkdir -p $(HIGRESS_DOCKER_BUILD_TOP)/$@ && TARGET_ARCH=amd64 ./docker/docker-copy.sh $^ $(HIGRESS_DOCKER_BUILD_TOP)/$@ && cd $(HIGRESS_DOCKER_BUILD_TOP)/$@ $(BUILD_PRE) && docker build $(BUILD_ARGS) --build-arg BASE_DISTRIBUTION=$(call normalize-tag,$(VARIANT)) --build-arg TARGETARCH=amd64 -t $(IMG_URL)$(call variant-tag,$(VARIANT)) -f Dockerfile.higress . ); )

docs/architecture.md

@@ -96,6 +96,17 @@ Ingress Config 包含 6 个控制器，各自负责不同的功能：
 - Http2Rpc Controller：监听 Http2Rpc 资源，实现 HTTP 协议到 RPC 协议的转换。用户可以通过配置协议转换，将 RPC 服务以 HTTP 接口的形式暴露，从而使用 HTTP 请求调用 RPC 接口。
 - WasmPlugin Controller：监听 WasmPlugin 资源，将 Higress WasmPlugin 转化为 Istio WasmPlugin。Higress WasmPlugin 在 Istio WasmPlugin 的基础上进行了扩展，支持全局、路由、域名、服务级别的配置。
 - ConfigmapMgr：监听 Higress 的全局配置 `higress-config` ConfigMap，可以根据 tracing、gzip 等配置构造 EnvoyFilter。
+  `mcpServer.redis` 支持通过 Secret 引用保存敏感信息，密码字段可以使用 `passwordSecret` 指向 `higress-system` 命名空间下的 Kubernetes Secret，避免在 ConfigMap 中保存明文密码，例如：
+
+  ```yaml
+  higress: |-
+    mcpServer:
+      redis:
+        address: "redis:6379"
+        passwordSecret:
+          name: redis-credentials
+          key: password
+  ```
 
 #### 2.2.2 Cert Server
 
@@ -140,4 +151,4 @@ Envoy 核心架构如下图：
 - [1] [Istio Pilot 组件介绍](https://www.zhaohuabing.com/post/2019-10-21-pilot-discovery-code-analysis/)
 - [2] [Istio 服务注册插件机制代码解析](https://www.zhaohuabing.com/post/2019-02-18-pilot-service-registry-code-analysis/)
 - [3] [Istio Pilot代码深度解析](https://www.zhaohuabing.com/post/2019-10-21-pilot-discovery-code-analysis/)
-- [4] [Envoy 官方文档](https://www.envoyproxy.io/docs/envoy/latest/intro/intro)
+- [4] [Envoy 官方文档](https://www.envoyproxy.io/docs/envoy/latest/intro/intro)

go.mod

@@ -1,6 +1,6 @@
-module github.com/alibaba/higress
+module github.com/alibaba/higress/v2
 
-go 1.22.2
+go 1.24.4
 
 replace github.com/spf13/viper => github.com/istio/viper v1.3.3-0.20190515210538-2789fed3109c
 
@@ -20,57 +20,61 @@ require (
 	github.com/caddyserver/certmagic v0.21.3
 	github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5
 	github.com/dubbogo/gost v1.13.1
-	github.com/envoyproxy/go-control-plane v0.11.2-0.20230725211550-11bfe846bcd4
-	github.com/go-errors/errors v1.4.2
+	github.com/envoyproxy/go-control-plane/envoy v1.35.0
+	github.com/go-errors/errors v1.5.1
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.5.3
-	github.com/google/go-cmp v0.6.0
+	github.com/golang/protobuf v1.5.4
+	github.com/google/go-cmp v0.7.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/hashicorp/consul/api v1.21.0
+	github.com/hashicorp/consul/api v1.32.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hudl/fargo v1.4.0
 	github.com/mholt/acmez v1.2.0
 	github.com/nacos-group/nacos-sdk-go v1.0.8
 	github.com/nacos-group/nacos-sdk-go/v2 v2.3.2
-	github.com/onsi/gomega v1.27.10
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.4
+	github.com/spf13/cobra v1.9.1
+	github.com/spf13/pflag v1.0.7
+	github.com/stretchr/testify v1.11.1
 	github.com/tidwall/gjson v1.17.0
 	go.uber.org/atomic v1.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/net v0.33.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13
-	google.golang.org/grpc v1.59.0
-	google.golang.org/protobuf v1.33.0
-	istio.io/api v1.19.5-0.20231206014255-f55a2b1e931e
+	golang.org/x/net v0.44.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4
+	google.golang.org/grpc v1.76.0
+	google.golang.org/protobuf v1.36.10
+	istio.io/api v1.27.1-0.20250820125923-f5a5d3a605a9
+	istio.io/client-go v1.27.1-0.20250820130622-12f6d11feb40
 	istio.io/istio v0.0.0
-	istio.io/pkg v0.0.0-20231221211216-7635388a563e
-	k8s.io/api v0.28.3
-	k8s.io/apiextensions-apiserver v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/cli-runtime v0.28.0
-	k8s.io/client-go v0.28.3
+	istio.io/pkg v0.0.0-20250718200944-0aab346caa39
+	k8s.io/api v0.34.1
+	k8s.io/apiextensions-apiserver v0.34.1
+	k8s.io/apimachinery v0.34.1
+	k8s.io/cli-runtime v0.33.3
+	k8s.io/client-go v0.34.1
 	knative.dev/networking v0.0.0-20220302134042-e8b2eb995165
 	knative.dev/pkg v0.0.0-20220301181942-2fdd5f232e77
-	sigs.k8s.io/controller-runtime v0.16.3
-	sigs.k8s.io/gateway-api v0.8.0
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0
-	sigs.k8s.io/yaml v1.4.0
+	sigs.k8s.io/controller-runtime v0.22.3
+	sigs.k8s.io/gateway-api v1.4.0
+	sigs.k8s.io/gateway-api-inference-extension v1.1.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	cloud.google.com/go v0.110.8 // indirect
-	cloud.google.com/go/compute v1.23.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/logging v1.8.1 // indirect
-	cloud.google.com/go/longrunning v0.5.1 // indirect
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
+	cel.dev/expr v0.24.0 // indirect
+	cloud.google.com/go v0.120.0 // indirect
+	cloud.google.com/go/auth v0.16.5 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.8.4 // indirect
+	cloud.google.com/go/logging v1.13.0 // indirect
+	cloud.google.com/go/longrunning v0.6.7 // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.1 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
-	github.com/alecholmes/xfccparser v0.1.0 // indirect
-	github.com/alecthomas/participle v0.4.1 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
+	github.com/alecholmes/xfccparser v0.4.0 // indirect
+	github.com/alecthomas/participle/v2 v2.1.4 // indirect
 	github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 // indirect
 	github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect
 	github.com/alibabacloud-go/darabonba-array v0.1.0 // indirect
@@ -92,177 +96,189 @@ require (
 	github.com/aliyun/alibabacloud-dkms-transfer-go-sdk v0.1.8 // indirect
 	github.com/aliyun/aliyun-secretsmanager-client-go v1.1.5 // indirect
 	github.com/aliyun/credentials-go v1.4.3 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
-	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
-	github.com/coreos/go-oidc/v3 v3.6.0 // indirect
+	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
+	github.com/coreos/go-oidc/v3 v3.14.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/deckarep/golang-set v1.7.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/docker/cli v24.0.7+incompatible // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.7+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.7.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
-	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
-	github.com/fatih/color v1.15.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
+	github.com/docker/cli v28.1.1+incompatible // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.9.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/envoyproxy/go-control-plane v0.13.4 // indirect
+	github.com/envoyproxy/go-control-plane/contrib v0.0.0-20251016030003-90eca0228178 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/go-openapi/jsonpointer v0.21.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/btree v1.1.2 // indirect
-	github.com/google/cel-go v0.16.1 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-containerregistry v0.15.2 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/cel-go v0.26.0 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/go-containerregistry v0.20.3 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
-	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
-	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
+	github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
-	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/hashicorp/golang-lru v0.6.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.4 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v1.0.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.3 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx v1.2.26 // indirect
+	github.com/lestrrat-go/jwx v1.2.31 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f // indirect
 	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
 	github.com/libdns/libdns v0.2.2 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
-	github.com/miekg/dns v1.1.59 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/miekg/dns v1.1.68 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/spdystream v0.5.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
-	github.com/openshift/api v0.0.0-20230720094506-afcbe27aec7c // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/openshift/api v0.0.0-20250507150912-7318813e48da // indirect
 	github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240409071808-615f978279ca // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.45.0 // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/prometheus v0.307.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/cast v1.8.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/tetratelabs/wazero v1.7.3 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/tetratelabs/wazero v1.9.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3 // indirect
-	github.com/vbatts/tar-split v0.11.3 // indirect
+	github.com/vbatts/tar-split v0.12.1 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/yl2chen/cidranger v1.0.2 // indirect
 	github.com/zeebo/blake3 v0.2.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/otel v1.17.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230714155235-03b8c47770f2 // indirect
-	go.opentelemetry.io/otel/metric v1.17.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.17.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.57.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/api v0.132.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/crypto v0.42.0 // indirect
+	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
+	golang.org/x/mod v0.28.0 // indirect
+	golang.org/x/oauth2 v0.31.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/term v0.35.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/time v0.13.0 // indirect
+	golang.org/x/tools v0.37.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
+	google.golang.org/api v0.250.0 // indirect
+	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gotest.tools/v3 v3.5.0 // indirect
-	istio.io/client-go v1.19.5-0.20231206015206-8cdf6a3b3cfd // indirect
-	k8s.io/apiserver v0.28.3 // indirect
-	k8s.io/component-base v0.28.3 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-	k8s.io/kubectl v0.28.0 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
-	sigs.k8s.io/mcs-api v0.1.0 // indirect
+	k8s.io/apiserver v0.34.1 // indirect
+	k8s.io/component-base v0.34.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
+	k8s.io/kubectl v0.33.3 // indirect
+	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/kustomize/api v0.19.0 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
+	sigs.k8s.io/mcs-api v0.1.1-0.20240624222831-d7001fe1d21c // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )
 
 replace istio.io/api => ./external/api
 
 replace github.com/envoyproxy/go-control-plane => ./external/go-control-plane
 
+replace github.com/envoyproxy/go-control-plane/contrib => ./external/go-control-plane/contrib
+
+replace github.com/envoyproxy/go-control-plane/envoy => ./external/go-control-plane/envoy
+
 replace istio.io/pkg => ./external/pkg
 
 replace istio.io/client-go => ./external/client-go

helm/core/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.6
+appVersion: 2.1.9
 description: Helm chart for deploying higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -15,4 +15,4 @@ dependencies:
     repository: "file://../redis"
     version: 0.0.1
 type: application
-version: 2.1.6
+version: 2.1.9

helm/core/README.md

@@ -1,5 +1,5 @@
-# Higress Core Helm Chart
-
-Installs the core components of cloud-native gateway [Higress](http://higress.io/)
-
-**Note:** It is highly recommended to install the whole package of Higress. Please visit https://higress.io/docs/user/quickstart/ for details.
+# Higress Core Helm Chart
+
+Installs the core components of cloud-native gateway [Higress](http://higress.io/)
+
+**Note:** It is highly recommended to install the whole package of Higress. Please visit https://higress.io/docs/user/quickstart/ for details.

helm/core/crds/customresourcedefinitions.gen.yaml

@@ -71,6 +71,11 @@ spec:
                       items:
                         type: string
                       type: array
+                    routeType:
+                      enum:
+                      - HTTP
+                      - GRPC
+                      type: string
                     service:
                       items:
                         type: string
@@ -247,6 +252,23 @@ spec:
         properties:
           spec:
             properties:
+              proxies:
+                items:
+                  properties:
+                    connectTimeout:
+                      type: integer
+                    listenerPort:
+                      type: integer
+                    name:
+                      type: string
+                    serverAddress:
+                      type: string
+                    serverPort:
+                      type: integer
+                    type:
+                      type: string
+                  type: object
+                type: array
               registries:
                 items:
                   properties:
@@ -309,10 +331,26 @@ spec:
                       type: integer
                     protocol:
                       type: string
+                    proxyName:
+                      type: string
                     sni:
                       type: string
                     type:
                       type: string
+                    vport:
+                      properties:
+                        default:
+                          type: integer
+                        services:
+                          items:
+                            properties:
+                              name:
+                                type: string
+                              value:
+                                type: integer
+                            type: object
+                          type: array
+                      type: object
                     zkServicesPath:
                       items:
                         type: string

helm/core/templates/configmap.yaml

@@ -112,6 +112,9 @@ data:
     {{- if hasKey .Values "downstream" }}
     {{- $_ := set $newData "downstream" .Values.downstream }}
     {{- end }}
+    {{- if hasKey .Values "gzip" }}
+    {{- $_ := set $newData "gzip" .Values.gzip }}
+    {{- end }}
     {{- if and (hasKey .Values "tracing") .Values.tracing.enable }}
     {{- $_ := set $newData "tracing" .Values.tracing }}
     {{- end }}

helm/core/templates/controller-clusterrole.yaml

@@ -38,6 +38,14 @@ rules:
     resources: ["*"]
     verbs: ["get", "watch", "list", "create", "update", "delete", "patch"]
 
+  # Gateway api inference extension
+  - apiGroups: ["inference.networking.k8s.io"]
+    resources: ["*"]
+    verbs: ["get", "watch", "list", "create", "update", "delete", "patch"]
+  - apiGroups: ["inference.networking.x-k8s.io"]
+    resources: ["*"]
+    verbs: ["get", "watch", "list", "create", "update", "delete", "patch"]
+
   # Needed for multicluster secret reading, possibly ingress certs in the future
   - apiGroups: [""]
     resources: ["secrets"]

helm/core/templates/controller-deployment.yaml

@@ -78,6 +78,10 @@ spec:
             value: "{{ .Values.global.enableGatewayAPI }}"
           - name: PILOT_ENABLE_ALPHA_GATEWAY_API
             value: "{{ .Values.global.enableGatewayAPI }}"
+          {{- if .Values.global.enableInferenceExtension }}
+          - name: ENABLE_GATEWAY_API_INFERENCE_EXTENSION
+            value: "true"
+          {{- end }}
           {{- if .Values.controller.env }}
           {{- range $key, $val := .Values.controller.env }}
           - name: {{ $key }}
@@ -174,7 +178,15 @@ spec:
           - name: HOST_RDS_MERGE_SUBSET
             value: "{{ .Values.global.hostRDSMergeSubset }}"
           - name: PILOT_FILTER_GATEWAY_CLUSTER_CONFIG
+            {{- if .Values.global.enableInferenceExtension }}
+            value: "false"
+            {{- else }}
             value: "{{ .Values.global.onlyPushRouteCluster }}"
+            {{- end }}
+          {{- if .Values.global.enableInferenceExtension }}
+          - name: ENABLE_GATEWAY_API_INFERENCE_EXTENSION
+            value: "true"
+          {{- end }}
           - name: HIGRESS_CONTROLLER_SVC
             value: "127.0.0.1"
           - name: HIGRESS_CONTROLLER_PORT

helm/core/templates/fallback-envoyfilter.yaml

@@ -19,4 +19,7 @@ spec:
         value:
           name: envoy.filters.http.custom_response
           typed_config:
-            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
+            "@type": type.googleapis.com/envoy.extensions.filters.http.custom_response.v3.CustomResponse
+  workloadSelector:
+    labels:
+      {{- include "gateway.selectorLabels" . | nindent 6 }}

helm/core/templates/podmonitor.yaml

@@ -5,6 +5,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gateway.labels" . | nindent 4}}
+    {{- with .Values.gateway.metrics.podMonitorSelector }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
     {{- .Values.gateway.annotations | toYaml | nindent 4 }}
 spec:

helm/core/values.yaml

@@ -44,7 +44,9 @@ global:
   # -- If true, Higress Controller will monitor istio resources as well
   enableIstioAPI: true
   # -- If true, Higress Controller will monitor Gateway API resources as well
-  enableGatewayAPI: false
+  enableGatewayAPI: true
+  # -- If true, enable Gateway API Inference Extension support
+  enableInferenceExtension: false
   # -- Used to locate istiod.
   istioNamespace: istio-system
   # -- enable pod disruption budget for the control plane, which is used to
@@ -528,6 +530,11 @@ gateway:
   metrics:
     # -- If true, create PodMonitor or VMPodScrape for gateway
     enabled: false
+    # -- Selector for PodMonitor
+    # When using monitoring.coreos.com/v1.PodMonitor, the selector must match
+    # the label "release: kube-prome" is the default for kube-prometheus-stack
+    podMonitorSelector:
+      release: kube-prome
     # -- provider group name for CustomResourceDefinition, can be monitoring.coreos.com or operator.victoriametrics.com
     provider: monitoring.coreos.com
     interval: ""
@@ -732,6 +739,26 @@ upstream:
   idleTimeout: 10
   connectionBufferLimits: 10485760
 
+# -- Gzip compression settings
+gzip:
+  enable: true
+  minContentLength: 1024
+  contentType:
+    - "text/html"
+    - "text/css"
+    - "text/plain"
+    - "text/xml"
+    - "application/json"
+    - "application/javascript"
+    - "application/xhtml+xml"
+    - "image/svg+xml"
+  disableOnEtagHeader: true
+  memoryLevel: 5
+  windowBits: 12
+  chunkSize: 4096
+  compressionLevel: "BEST_COMPRESSION"
+  compressionStrategy: "DEFAULT_STRATEGY"
+
 redis:
   redis:
     name: redis-stack-server

helm/higress/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: higress-core
   repository: file://../core
-  version: 2.1.6
+  version: 2.1.9
 - name: higress-console
   repository: https://higress.io/helm-charts/
-  version: 2.1.6
-digest: sha256:c5bebb3bd92bf799804443faf9ab69e88ed26815a709e58911859b504b3d04db
-generated: "2025-07-30T21:13:57.834398+08:00"
+  version: 2.1.9
+digest: sha256:d696af6726b40219cc16e7cf8de7400101479dfbd8deb3101d7ee736415b9875
+generated: "2025-11-13T16:33:49.721553+08:00"

helm/higress/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.1.6
+appVersion: 2.1.9
 description: Helm chart for deploying Higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -12,9 +12,9 @@ sources:
 dependencies:
 - name: higress-core
   repository: "file://../core"
-  version: 2.1.6
+  version: 2.1.9
 - name: higress-console
   repository: "https://higress.io/helm-charts/"
-  version: 2.1.6
+  version: 2.1.9
 type: application
-version: 2.1.6
+version: 2.1.9

helm/higress/README.md

@@ -104,6 +104,7 @@ The command removes all the Kubernetes components associated with the chart and
 | gateway.metrics.interval | string | `""` |  |
 | gateway.metrics.metricRelabelConfigs | list | `[]` | for operator.victoriametrics.com/v1beta1.VMPodScrape |
 | gateway.metrics.metricRelabelings | list | `[]` | for monitoring.coreos.com/v1.PodMonitor |
+| gateway.metrics.podMonitorSelector | object | `{"release":"kube-prome"}` | Selector for PodMonitor When using monitoring.coreos.com/v1.PodMonitor, the selector must match the label "release: kube-prome" is the default for kube-prometheus-stack |
 | gateway.metrics.provider | string | `"monitoring.coreos.com"` | provider group name for CustomResourceDefinition, can be monitoring.coreos.com or operator.victoriametrics.com |
 | gateway.metrics.rawSpec | object | `{}` | some more raw podMetricsEndpoints spec |
 | gateway.metrics.relabelConfigs | list | `[]` |  |
@@ -160,9 +161,10 @@ The command removes all the Kubernetes components associated with the chart and
 | global.defaultResources | object | `{"requests":{"cpu":"10m"}}` | A minimal set of requested resources to applied to all deployments so that Horizontal Pod Autoscaler will be able to function (if set). Each component can overwrite these default values by adding its own resources block in the relevant section below and setting the desired resources values. |
 | global.defaultUpstreamConcurrencyThreshold | int | `10000` |  |
 | global.disableAlpnH2 | bool | `false` | Whether to disable HTTP/2 in ALPN |
-| global.enableGatewayAPI | bool | `false` | If true, Higress Controller will monitor Gateway API resources as well |
+| global.enableGatewayAPI | bool | `true` | If true, Higress Controller will monitor Gateway API resources as well |
 | global.enableH3 | bool | `false` |  |
 | global.enableIPv6 | bool | `false` |  |
+| global.enableInferenceExtension | bool | `false` | If true, enable Gateway API Inference Extension support |
 | global.enableIstioAPI | bool | `true` | If true, Higress Controller will monitor istio resources as well |
 | global.enableLDSCache | bool | `false` |  |
 | global.enablePluginServer | bool | `false` |  |
@@ -242,6 +244,7 @@ The command removes all the Kubernetes components associated with the chart and
 | global.useMCP | bool | `false` | Use the Mesh Control Protocol (MCP) for configuring Istiod. Requires an MCP source. |
 | global.watchNamespace | string | `""` | If not empty, Higress Controller will only watch resources in the specified namespace. When isolating different business systems using K8s namespace, if each namespace requires a standalone gateway instance, this parameter can be used to confine the Ingress watching of Higress within the given namespace. |
 | global.xdsMaxRecvMsgSize | string | `"104857600"` |  |
+| gzip | object | `{"chunkSize":4096,"compressionLevel":"BEST_COMPRESSION","compressionStrategy":"DEFAULT_STRATEGY","contentType":["text/html","text/css","text/plain","text/xml","application/json","application/javascript","application/xhtml+xml","image/svg+xml"],"disableOnEtagHeader":true,"enable":true,"memoryLevel":5,"minContentLength":1024,"windowBits":12}` | Gzip compression settings |
 | hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` |  |
 | meshConfig | object | `{"enablePrometheusMerge":true,"rootNamespace":null,"trustDomain":"cluster.local"}` | meshConfig defines runtime configuration of components, including Istiod and istio-agent behavior See https://istio.io/docs/reference/config/istio.mesh.v1alpha1/ for all available options |
 | meshConfig.rootNamespace | string | `nil` | The namespace to treat as the administrative root namespace for Istio configuration. When processing a leaf namespace Istio will search for declarations in that namespace first and if none are found it will search in the root namespace. Any matching declaration found in the root namespace is processed as if it were declared in the leaf namespace. |

helm/higress/README.zh.md

@@ -1,150 +0,0 @@
-## Higress 适用于 Kubernetes
-
-Higress 是基于阿里巴巴内部网关实践的云原生 API 网关。
-
-通过 Istio 和 Envoy 的支持，Higress 实现了流量网关、微服务网关和安全网关三种架构的融合，从而极大地减少了部署、运维的成本。
-
-## 设置仓库信息
-
-```console
-helm repo add higress.io https://higress.io/helm-charts
-helm repo update
-```
-
-## 安装
-
-使用 Helm 安装名为 `higress` 的组件：
-
-```console
-helm install higress -n higress-system higress.io/higress --create-namespace --render-subchart-notes
-```
-
-## 卸载
-
-删除名称为 higress 的安装：
-
-```console
-helm delete higress -n higress-system
-```
-
-该命令将删除与组件关联的所有 Kubernetes 组件并卸载该发行版。
-
-## 参数
-
-## Values
-
-| 键 | 类型 | 默认值 | 描述 |
-|----|------|---------|-------------|
-| clusterName | string | `""` | 集群名 |
-| controller.affinity | object | `{}` | 控制器亲和性设置 |
-| controller.automaticHttps.email | string | `""` | 自动 HTTPS 所需的邮件 |
-| controller.automaticHttps.enabled | bool | `true` | 是否启用自动 HTTPS 功能 |
-| controller.autoscaling.enabled | bool | `false` | 是否启用控制器的自动扩展功能 |
-| controller.autoscaling.maxReplicas | int | `5` | 最大副本数 |
-| controller.autoscaling.minReplicas | int | `1` | 最小副本数 |
-| controller.autoscaling.targetCPUUtilizationPercentage | int | `80` | 目标 CPU 使用率百分比 |
-| controller.env | object | `{}` | 环境变量 |
-| controller.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | 图像库的基础地址 |
-| controller.image | string | `"higress"` | 镜像名称 |
-| controller.imagePullSecrets | list | `[]` | 拉取秘钥列表 |
-| controller.labels | object | `{}` | 标签 |
-| controller.name | string | `"higress-controller"` | 控制器名称 |
-| controller.nodeSelector | object | `{}` | 节点选择器 |
-| controller.podAnnotations | object | `{}` | Pod 注解 |
-| controller.podLabels | object | `{}` | 应用到 Pod 上的标签 |
-| controller.podSecurityContext | object | `{}` | Pod 安全上下文 |
-| controller.ports[0].name | string | `"http"` | 端口名称 |
-| controller.ports[0].port | int | `8888` | 端口编号 |
-| controller.ports[0].protocol | string | `"TCP"` | 协议类型 |
-| controller.ports[0].targetPort | int | `8888` | 目标端口 |
-| controller.ports[1].name | string | `"http-solver"` | 端口名称 |
-| controller.ports[1].port | int | `8889` | 端口编号 |
-| controller.ports[1].protocol | string | `"TCP"` | 协议类型 |
-| controller.ports[1].targetPort | int | `8889` | 目标端口 |
-| controller.ports[2].name | string | `"grpc"` | 端口名称 |
-| controller.ports[2].port | int | `15051` | 端口编号 |
-| controller.ports[2].protocol | string | `"TCP"` | 协议类型 |
-| controller.ports[2].targetPort | int | `15051` | 目标端口 |
-| controller.probe.httpGet.path | string | `"/ready"` | 运行状况检查路径 |
-| controller.probe.httpGet.port | int | `8888` | 端口运行状态检查 |
-| controller.probe.initialDelaySeconds | int | `1` | 初始延迟秒数 |
-| controller.probe.periodSeconds | int | `3` | 健康检查间隔秒数 |
-| controller.probe.timeoutSeconds | int | `5` | 超时秒数 |
-| controller.rbac.create | bool | `true` | 是否创建 RBAC 相关资源 |
-| controller.replicas | int | `1` | Higress 控制器 Pod 的数量 |
-| controller.resources.limits.cpu | string | `"1000m"` | CPU 上限 |
-| controller.resources.limits.memory | string | `"2048Mi"` | 内存上限 |
-| controller.resources.requests.cpu | string | `"500m"` | CPU 请求量 |
-| controller.resources.requests.memory | string | `"2048Mi"` | 内存请求量 |
-| controller.securityContext | object | `{}` | 安全上下文 |
-| controller.service.type | string | `"ClusterIP"` | 服务类型 |
-| controller.serviceAccount.annotations | object | `{}` | 添加到服务帐户的注解 |
-| controller.serviceAccount.create | bool | `true` | 是否创建服务帐户 |
-| controller.serviceAccount.name | string | `""` | 如果未设置且 create 为 true，则从 fullname 模板生成名称 |
-| controller.tag | string | `""` | 标记 |
-| controller.tolerations | list | `[]` | 受容容忍度列表 |
-| downstream.connectionBufferLimits | int | `32768` | 下游连接缓冲区限制（字节） |
-| downstream.http2.initialConnectionWindowSize | int | `1048576` | HTTP/2 初始连接窗口大小 |
-| downstream.http2.initialStreamWindowSize | int | `65535` | 流初始窗口大小 |
-| downstream.http2.maxConcurrentStreams | int | `100` | 并发流最大数量 |
-| downstream.idleTimeout | int | `180` | 空闲超时时间（秒） |
-| downstream.maxRequestHeadersKb | int | `60` | 最大请求头大小（KB） |
-| downstream.routeTimeout | int | `0` | 路由超时时间 |
-| gateway.affinity | object | `{}` | 网关的节点亲和性 |
-| gateway.annotations | object | `{}` | 应用于所有资源的注解 |
-| gateway.autoscaling.enabled | bool | `false` | 启用网关的自动扩展功能 |
-| gateway.autoscaling.maxReplicas | int | `5` | 最大副本数 |
-| gateway.autoscaling.minReplicas | int | `1` | 最小副本数 |
-| gateway.autoscaling.targetCPUUtilizationPercentage | int | `80` | CPU 使用率的目标百分比 |
-| gateway.containerSecurityContext | string | `nil` | 网关容器的安全配置上下文 |
-| gateway.env | object | `{}` | Pod 环境变量 |
-| gateway.hostNetwork | bool | `false` | 是否使用主机网络 |
-| gateway.httpPort | int | `80` | HTTP 服务端口 |
-| gateway.httpsPort | int | `443` | HTTPS 服务端口 |
-| gateway.hub | string | `"higress-registry.cn-hangzhou.cr.aliyuncs.com/higress"` | 网关镜像的基础域名 |
-| gateway.image | string | `"gateway"` |  |
-| gateway.kind | string | `"Deployment"` | 部署类型 |
-| gateway.labels | object | `{}` | 应用于所有资源的标签 |
-| gateway.metrics.enabled | bool | `false` | 启用网关度量收集 |
-| gateway.metrics.honorLabels | bool | `false` | 是否合并现有标签 |
-| gateway.metrics.interval | string | `""` | 度量间隔时间 |
-| gateway.metrics.provider | string | `"monitoring.coreos.com"` | 定义监控提供者 |
-| gateway.metrics.rawSpec | object | `{}` | 额外的度量规范 |
-| gateway.metrics.relabelConfigs | list | `[]` | 重新标签配置 |
-| gateway.metrics.relabelings | list | `[]` | 重新标签项 |
-| gateway.metrics.scrapeTimeout | string | `""` | 抓取的超时时间 |
-| gateway.name | string | `"higress-gateway"` | 网关名称 |
-| gateway.networkGateway | string | `""` | 网络网关指定 |
-| gateway.nodeSelector | object | `{}` | 节点选择器 |
-| gateway.replicas | int | `2` | Higress Gateway pod 的数量 |
-| gateway.resources.limits.cpu | string | `"2000m"` | 容器资源限制的 CPU |
-| gateway.resources.limits.memory | string | `"2048Mi"` | 容器资源限制的内存 |
-| gateway.resources.requests.cpu | string | `"2000m"` | 容器资源请求的 CPU |
-| gateway.resources.requests.memory | string | `"2048Mi"` | 容器资源请求的内存 |
-| gateway.revision | string | `""` | 网关所属版本声明 |
-| gateway.rollingMaxSurge | string | `"100%"` | 最大激增数目百分比 |
-| gateway.rollingMaxUnavailable | string | `"25%"` | 最大不可用比例 |
-| gateway.readinessFailureThreshold | int | `30` | 成功尝试之前连续失败的最大探测次数 |
-| gateway.readinessInitialDelaySeconds | int | `1` | 初次检测推迟多少秒后开始探测存活状态 |
-| gateway.readinessPeriodSeconds | int | `2` | 存活探测间隔秒数 |
-| gateway.readinessSuccessThreshold | int | `1` | 认为成功之前连续成功最小探测次数 |
-| gateway.readinessTimeoutSeconds | int | `3` | 存活探测超时秒数 |
-| gateway.securityContext | string | `nil` | 客户豆荚的安全上下文 |
-| gateway.service.annotations | object | `{}` | 应用于服务账户的注释 |
-| gateway.service.externalTrafficPolicy | string | `""` | 外部路由策略 |
-| gateway.service.loadBalancerClass | string | `""` | 负载均衡器类别 |
-| gateway.service.loadBalancerIP | string | `""` | 负载均衡器 IP 地址 |
-| gateway.service.loadBalancerSourceRanges | list | `[]` | 允许访问负载均衡器的 CIDR 范围 |
-| gateway.service.ports[0].name | string | `"http2"` | 服务定义的端口名称 |
-| gateway.service.ports[0].port | int | `80` | 服务端口 |
-| gateway.service.ports[0].protocol | string | `"TCP"` | 协议 |
-| gateway.service.ports[0].targetPort | int | `80` | 靶向端口 |
-| gateway.service.ports[1].name | string | `"https"` | 服务定义的端口名称 |
-| gateway.service.ports[1].port | int | `443` | 服务端口 |
-| gateway.service.ports[1].protocol | string | `"TCP"` | 协议 |
-| gateway.service.ports[1].targetPort | int | `443` | 靶向端口 |
-| gateway.service.type | string | `"LoadBalancer"` | 服务类型 |
-| global.disableAlpnH2 | bool | `false` | 设置是否禁用 ALPN 中的 http/2 |
-| ... | ... | ... | ... |
-
-由于内容较多，其他参数可以参考完整表。

hgctl/cmd/hgctl/config/gateway_config.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/alibaba/higress/hgctl/pkg/kubernetes"
-	"github.com/alibaba/higress/pkg/cmd/options"
+	"github.com/alibaba/higress/v2/pkg/cmd/options"
 )
 
 var (

hgctl/cmd/hgctl/config/gateway_config_test.go

@@ -148,7 +148,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: BootstrapEnvoyConfigType,
 			expected:     "out.bootstrap.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.json",
@@ -157,7 +158,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ClusterEnvoyConfigType,
 			expected:     "out.cluster.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.json",
@@ -166,7 +168,8 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
 			output:       "yaml",
 			resourceType: ListenerEnvoyConfigType,
 			expected:     "out.listener.yaml",
-		}, {
+		},
+		{
 			output:       "json",
 			resourceType: RouteEnvoyConfigType,
 			expected:     "out.route.json",

hgctl/cmd/hgctl/main.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/alibaba/higress/hgctl/pkg"
+	hgctl "github.com/alibaba/higress/hgctl/pkg"
 )
 
 func main() {

hgctl/go.mod

@@ -1,8 +1,6 @@
 module github.com/alibaba/higress/hgctl
 
-go 1.22.2
-
-toolchain go1.23.7
+go 1.24.4
 
 replace github.com/spf13/viper => github.com/istio/viper v1.3.3-0.20190515210538-2789fed3109c
 
@@ -15,201 +13,235 @@ replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-
 // Client-go does not handle different versions of mergo due to some breaking changes - use the matching version
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
 
+replace github.com/alibaba/higress/v2 => ../
+
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/alibaba/higress v0.0.0
+	github.com/alibaba/higress/v2 v2.0.0-00010101000000-000000000000
+	github.com/braydonk/yaml v0.7.0
 	github.com/compose-spec/compose-go v1.17.0
-	github.com/docker/cli v24.0.7+incompatible
+	github.com/docker/cli v28.1.1+incompatible
 	github.com/docker/compose/v2 v2.23.3
-	github.com/docker/docker v24.0.7+incompatible
-	github.com/evanphx/json-patch/v5 v5.7.0
-	github.com/fatih/color v1.15.0
+	github.com/docker/docker v28.4.0+incompatible
+	github.com/evanphx/json-patch/v5 v5.9.11
+	github.com/fatih/color v1.18.0
 	github.com/fatih/structtag v1.2.0
 	github.com/google/yamlfmt v0.10.0
+	github.com/higress-group/openapi-to-mcpserver v0.0.0-20250925065334-de60a170f950
 	github.com/iancoleman/orderedmap v0.3.0
 	github.com/kylelemons/godebug v1.1.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.16.0
-	github.com/stretchr/testify v1.8.4
+	github.com/spf13/cobra v1.9.1
+	github.com/spf13/pflag v1.0.7
+	github.com/spf13/viper v1.20.1
+	github.com/stretchr/testify v1.11.1
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
-	helm.sh/helm/v3 v3.12.2
+	helm.sh/helm/v3 v3.18.5
 	istio.io/istio v0.0.0
-	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.28.3
-	k8s.io/cli-runtime v0.28.0
-	k8s.io/client-go v0.28.3
-	k8s.io/kubectl v0.28.0
-	sigs.k8s.io/controller-runtime v0.16.3
-	sigs.k8s.io/yaml v1.4.0
+	k8s.io/api v0.34.1
+	k8s.io/apimachinery v0.34.1
+	k8s.io/cli-runtime v0.33.3
+	k8s.io/client-go v0.34.1
+	k8s.io/kubectl v0.33.3
+	sigs.k8s.io/controller-runtime v0.22.3
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	cel.dev/expr v0.24.0 // indirect
+	dario.cat/mergo v1.0.2 // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/chzyer/readline v1.5.0 // indirect
+	github.com/containerd/containerd/api v1.8.0 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
+	github.com/containerd/ttrpc v1.2.7 // indirect
+	github.com/envoyproxy/go-control-plane/contrib v0.0.0-20251016030003-90eca0228178 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.2 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240409071808-615f978279ca // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
+	oras.land/oras-go/v2 v2.6.0 // indirect
+	sigs.k8s.io/gateway-api-inference-extension v1.1.0 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+)
+
+require (
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.2.1 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/Masterminds/squirrel v1.5.4 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/Microsoft/hcsshim v0.11.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/hcsshim v0.11.7 // indirect
 	github.com/RageCage64/multilinediff v0.2.0 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.17.6 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.18.16 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.16 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.31 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.24 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.12.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 // indirect
-	github.com/aws/smithy-go v1.13.5 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.39.2 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.16 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
+	github.com/aws/smithy-go v1.23.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
-	github.com/braydonk/yaml v0.7.0 // indirect
 	github.com/buger/goterm v1.0.4 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/chai2010/gettext-go v1.0.3 // indirect
+	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
 	github.com/containerd/console v1.0.3 // indirect
-	github.com/containerd/containerd v1.7.7 // indirect
-	github.com/containerd/continuity v0.4.2 // indirect
+	github.com/containerd/containerd v1.7.27 // indirect
+	github.com/containerd/continuity v0.4.4 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/typeurl/v2 v2.1.1 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/containerd/typeurl/v2 v2.2.3 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
-	github.com/distribution/distribution/v3 v3.0.0-20230601133803-97b1d649c493 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
+	github.com/distribution/distribution/v3 v3.0.0 // indirect
 	github.com/docker/buildx v0.12.0 // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.7.0 // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.9.3 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/envoyproxy/go-control-plane v0.11.2-0.20230725211550-11bfe846bcd4 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
-	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
-	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
+	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
+	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsevents v0.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/go-errors/errors v1.4.2 // indirect
-	github.com/go-gorp/gorp/v3 v3.0.5 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/getkin/kin-openapi v0.118.0 // indirect
+	github.com/go-errors/errors v1.5.1 // indirect
+	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.20.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/jsonpointer v0.21.2 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/gofrs/flock v0.8.1 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/btree v1.1.2 // indirect
-	github.com/google/cel-go v0.16.1 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/cel-go v0.26.0 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
-	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
+	github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.4 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imdario/mergo v1.0.0 // indirect
 	github.com/in-toto/in-toto-golang v0.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmoiron/sqlx v1.3.5 // indirect
-	github.com/jonboulle/clockwork v0.4.0 // indirect
+	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.3 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx v1.2.26 // indirect
+	github.com/lestrrat-go/jwx v1.2.31 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/manifoldco/promptui v0.9.0
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mattn/go-shellwords v1.0.12 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	github.com/miekg/dns v1.1.59 // indirect
+	github.com/miekg/dns v1.1.68 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/buildkit v0.13.0-beta1.0.20231023114302-d5c1d785b042 // indirect
+	github.com/moby/buildkit v0.21.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/sys/signal v0.7.0 // indirect
 	github.com/moby/sys/symlink v0.2.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/opencontainers/runc v1.1.9 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.45.0 // indirect
-	github.com/rivo/uniseg v0.4.3 // indirect
-	github.com/rubenv/sql-migrate v1.3.1 // indirect
+	github.com/prometheus/client_golang v1.23.2 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/prometheus v0.307.1 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rubenv/sql-migrate v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
 	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
 	github.com/shibumi/go-pathspec v1.3.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/afero v1.14.0 // indirect
+	github.com/spf13/cast v1.8.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
@@ -224,65 +256,63 @@ require (
 	github.com/xlab/treeprint v1.2.0 // indirect
 	github.com/zmap/zcrypto v0.0.0-20230310154051-c8b263fd8300 // indirect
 	github.com/zmap/zlint/v3 v3.6.3 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
-	go.opentelemetry.io/otel v1.17.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.39.1-0.20230714155235-03b8c47770f2 // indirect
-	go.opentelemetry.io/otel/metric v1.17.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.17.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.57.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/crypto v0.42.0 // indirect
+	golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
+	golang.org/x/mod v0.28.0 // indirect
+	golang.org/x/net v0.44.0 // indirect
+	golang.org/x/oauth2 v0.31.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/term v0.35.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/time v0.13.0 // indirect
+	golang.org/x/tools v0.37.0 // indirect
+	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
+	google.golang.org/grpc v1.76.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
-	istio.io/api v1.19.5-0.20231206014255-f55a2b1e931e // indirect
-	istio.io/client-go v1.19.5-0.20231206015206-8cdf6a3b3cfd // indirect
-	k8s.io/apiextensions-apiserver v0.28.3 // indirect
-	k8s.io/apiserver v0.28.3 // indirect
-	k8s.io/component-base v0.28.3 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	oras.land/oras-go v1.2.3 // indirect
-	sigs.k8s.io/gateway-api v0.8.0 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
-	sigs.k8s.io/mcs-api v0.1.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
+	istio.io/api v1.27.1-0.20250820125923-f5a5d3a605a9 // indirect
+	istio.io/client-go v1.27.1-0.20250820130622-12f6d11feb40 // indirect
+	k8s.io/apiextensions-apiserver v0.34.1 // indirect
+	k8s.io/apiserver v0.34.1 // indirect
+	k8s.io/component-base v0.34.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
+	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
+	sigs.k8s.io/gateway-api v1.4.0 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/kustomize/api v0.19.0 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
+	sigs.k8s.io/mcs-api v0.1.1-0.20240624222831-d7001fe1d21c // indirect
 )
 
 replace istio.io/api => ../external/api
 
 replace github.com/envoyproxy/go-control-plane => ../external/go-control-plane
 
+replace github.com/envoyproxy/go-control-plane/contrib => ../external/go-control-plane/contrib
+
+replace github.com/envoyproxy/go-control-plane/envoy => ../external/go-control-plane/envoy
+
 replace istio.io/pkg => ../external/pkg
 
 replace istio.io/client-go => ../external/client-go
@@ -293,6 +323,7 @@ replace github.com/alibaba/higress => ../
 
 replace (
 	github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7
+	github.com/distribution/distribution/v3 => github.com/distribution/distribution/v3 v3.0.0-20230601133803-97b1d649c493
 	github.com/docker/buildx => github.com/docker/buildx v0.11.2
 	github.com/docker/cli => github.com/docker/cli v24.0.6+incompatible
 	github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.20.2

hgctl/pkg/agent/README.md

@@ -0,0 +1,770 @@
+// Copyright (c) 2022 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+# Agent Module
+
+`pkg/agent` 是 hgctl 中用于 Agent 生命周期管理的核心模块，提供了从创建、配置、部署到发布的完整工作流。
+
+## 目录
+
+- [概述](#概述)
+- [架构设计](#架构设计)
+- [核心功能](#核心功能)
+- [主要组件](#主要组件)
+- [使用方式](#使用方式)
+- [配置管理](#配置管理)
+- [部署方式](#部署方式)
+- [集成说明](#集成说明)
+
+## 概述
+
+Agent 模块提供了一套完整的 AI Agent 开发和部署解决方案，支持：
+
+- **多种 Agentic Core**：集成 Claude Code 和 Qodercli
+- **本地和云端部署**：支持本地运行和 AgentRun (阿里云函数计算)
+- **MCP Server 管理**：支持 HTTP 和 OpenAPI 类型的 MCP Server
+- **Higress 集成**：自动发布 Agent API 到 Higress 网关
+- **Himarket 发布**：支持将 Agent 发布到 Himarket 市场
+
+## 架构设计
+
+```
+pkg/agent/
+├── agent.go           # CLI 命令入口和主要业务逻辑
+├── core.go           # Agentic Core (Claude/Qodercli) 封装
+├── new.go            # Agent 创建流程
+├── deploy.go         # Agent 部署处理（本地/云端）
+├── mcp.go            # MCP Server 管理
+├── config.go         # 配置管理和初始化
+├── base.go           # 基础函数和环境检查
+├── types.go          # 类型定义
+├── utils.go          # 工具函数
+├── common/           # 通用类型定义
+│   └── base.go       # ProductType 等常量
+├── services/         # 外部服务客户端
+│   ├── client.go     # HTTP 客户端封装
+│   ├── service.go    # Higress/Himarket API 封装
+│   └── utils.go      # 服务工具函数
+└── prompt/           # Prompt 模板和指导
+    ├── base.go       # Agent 开发指南
+    └── agent_guide.md
+```
+
+## 核心功能
+
+### 1. Agent 创建 (new.go)
+
+提供两种 Agent 创建方式：
+
+#### 1.1 交互式创建
+通过命令行交互式问答，逐步配置：
+- Agent 名称和描述
+- 系统 Prompt（支持直接输入、从文件导入、LLM 生成）
+- AI 模型配置（DashScope、OpenAI、Anthropic 等）
+- 工具集选择（AgentScope 内置工具）
+- MCP Server 配置
+- 部署设置
+
+#### 1.2 从 Core 导入
+从 Agentic Core 的 subagent 目录导入已有的 Agent 配置。
+
+**关键代码位置**:
+- `createAgentCmd()` (new.go:99): 创建命令定义
+- `getAgentConfig()` (utils.go:289): 获取 Agent 配置
+- `createAgentTemplate()` (new.go:205): 生成 Agent 模板文件
+
+### 2. Agent 部署 (deploy.go)
+
+支持两种部署模式：
+
+#### 2.1 本地部署 (Local)
+- 基于 AgentScope Runtime
+- 自动管理 Python 虚拟环境
+- 依赖管理：`agentscope`, `agentscope-runtime==1.0.0`
+- 默认端口：8090
+
+#### 2.2 云端部署 (AgentRun)
+- 部署到阿里云函数计算
+- 使用 Serverless Devs (s工具)
+- 自动构建和部署
+- 需要配置阿里云 Access Key
+
+**关键代码位置**:
+- `DeployHandler` (deploy.go:35): 部署处理器
+- `HandleLocal()` (deploy.go:350): 本地部署逻辑
+- `HandleAgentRun()` (deploy.go:305): AgentRun 部署逻辑
+
+### 3. MCP Server 管理 (mcp.go)
+
+支持两种类型的 MCP Server：
+
+#### 3.1 HTTP MCP Server
+直接通过 HTTP URL 添加：
+```bash
+hgctl mcp add [name] [url] --type http
+```
+
+#### 3.2 OpenAPI MCP Server
+从 OpenAPI 规范文件创建：
+```bash
+hgctl mcp add [name] [spec-file] --type openapi
+```
+
+功能特性：
+- 自动解析 OpenAPI 规范
+- 转换为 MCP Server 配置
+- 自动添加到 Agentic Core
+- 可选发布到 Higress
+- 支持发布到 Himarket 市场
+
+**关键代码位置**:
+- `handleAddMCP()` (mcp.go:183): MCP 添加主逻辑
+- `publishMCPToHigress()` (mcp.go:228): 发布到 Higress
+- `parseOpenapi2MCP()` (utils.go:79): OpenAPI 解析
+
+### 4. Agentic Core 集成 (core.go)
+
+封装了 Agentic Core（Claude Code/Qodercli）的交互：
+
+#### 支持的 Core 类型
+```go
+const (
+    CORE_CLAUDE   CoreType = "claude"
+    CORE_QODERCLI CoreType = "qodercli"
+)
+```
+
+#### 核心功能
+- **Setup()**: 初始化环境和插件
+- **Start()**: 启动交互式窗口
+- **AddMCPServer()**: 添加 MCP Server 到 Core
+- **ImproveNewAgent()**: 在特定 Agent 目录运行 Core 进行改进
+
+**关键代码位置**:
+- `AgenticCore` (core.go:32): Core 封装结构
+- `Setup()` (core.go:108): 环境初始化
+- `addHigressAPIMCP()` (core.go:161): 自动添加 Higress API MCP
+
+### 5. Higress 集成
+
+自动将 Agent API 发布到 Higress 网关：
+
+#### 支持的 API 类型
+```go
+const (
+    A2A   = "a2a"      // Agent-to-Agent
+    REST  = "restful"  // RESTful API
+    MODEL = "model"    // AI Model API
+)
+```
+
+#### 发布流程
+1. 创建 AI Provider Service
+2. 创建 AI Route
+3. 配置服务源和路由
+
+**关键代码位置**:
+- `publishAgentAPIToHigress()` (agent.go:123): 发布逻辑
+- `services/service.go`: Higress API 封装
+
+### 6. Himarket 集成
+
+支持将 Agent 发布到 Himarket 市场：
+
+#### 产品类型
+```go
+const (
+    MCP_SERVER ProductType = "MCP_SERVER"
+    MODEL_API  ProductType = "MODEL_API"
+    REST_API   ProductType = "REST_API"
+    AGENT_API  ProductType = "AGENT_API"
+)
+```
+
+**关键代码位置**:
+- `publishAPIToHimarket()` (base.go:128): 发布到市场
+- `services/service.go`: Himarket API 封装
+
+## 主要组件
+
+### AgentConfig 结构
+
+Agent 的核心配置结构：
+
+```go
+type AgentConfig struct {
+    AppName         string              // 应用名称
+    AppDescription  string              // 应用描述
+    AgentName       string              // Agent 名称
+    AvailableTools  []string            // 可用工具列表
+    SysPromptPath   string              // 系统 Prompt 路径
+    ChatModel       string              // 使用的模型
+    Provider        string              // 模型提供商
+    APIKeyEnvVar    string              // API Key 环境变量
+    DeploymentPort  int                 // 部署端口
+    HostBinding     string              // 主机绑定
+    EnableStreaming bool                // 是否启用流式响应
+    EnableThinking  bool                // 是否启用思考过程
+    MCPServers      []MCPServerConfig   // MCP Server 配置
+    Type            DeployType          // 部署类型
+    ServerlessCfg   ServerlessConfig    // Serverless 配置
+}
+```
+
+### 环境检查 (base.go)
+
+`EnvProvisioner` 负责检查和安装必要的环境：
+
+#### Node.js 检查
+- 最低版本要求：Node.js 18+
+- 支持自动安装（通过 fnm）
+
+#### Agentic Core 检查
+- 检查 claude 或 qodercli 是否安装
+- 支持自动安装（通过 npm）
+
+**关键代码位置**:
+- `EnvProvisioner.check()` (base.go:221): 环境检查
+- `promptNodeInstall()` (base.go:259): Node.js 安装引导
+- `promptAgentInstall()` (base.go:401): Core 安装引导
+
+## 使用方式
+
+### 命令结构
+
+```bash
+hgctl agent                    # 启动交互式 Agent 窗口
+hgctl agent new               # 创建新 Agent
+hgctl agent deploy [name]     # 部署 Agent
+hgctl agent add [name] [url]  # 添加 Agent API 到 Higress
+hgctl mcp add [name] [url]    # 添加 MCP Server
+```
+
+### 创建 Agent
+
+#### 本地部署的 Agent
+```bash
+hgctl agent new
+```
+
+交互式选择：
+1. 创建方式：step by step / 从 Core 导入
+2. Agent 名称和描述
+3. 系统 Prompt 设置
+4. 模型提供商和模型选择
+5. 工具选择
+6. MCP Server 配置
+7. 部署设置
+
+#### AgentRun 部署的 Agent
+```bash
+hgctl agent new --agent-run
+```
+
+额外配置：
+- Resource Name
+- Region
+- Disk Size
+- Timeout
+
+### 部署 Agent
+
+#### 部署到本地
+```bash
+hgctl agent deploy my-agent
+```
+
+自动处理：
+- Python 环境检查
+- 依赖安装
+- 启动 Agent 服务
+
+#### 部署到 AgentRun
+```bash
+hgctl agent deploy my-agent
+```
+
+要求：
+- 已配置阿里云 Access Key
+- 已安装 Docker
+- 已安装 Serverless Devs CLI
+
+### 添加 MCP Server
+
+#### 添加 HTTP MCP Server
+```bash
+hgctl mcp add my-mcp http://localhost:8080/mcp \
+  --type http \
+  --transport streamable \
+  -e API_KEY=secret \
+  -H "Authorization: Bearer token"
+```
+
+参数说明：
+- `--type`: MCP 类型（http/openapi）
+- `--transport`: 传输类型（streamable/sse）
+- `-e`: 环境变量
+- `-H`: HTTP 头部
+
+#### 从 OpenAPI 创建 MCP Server
+```bash
+hgctl mcp add swagger-mcp ./openapi.yaml \
+  --type openapi
+```
+
+自动完成：
+1. 解析 OpenAPI 规范
+2. 转换为 MCP 配置
+3. 发布到 Higress
+4. 添加到 Agentic Core
+
+### 发布到 Higress 和 Himarket
+
+```bash
+hgctl agent add my-agent http://my-agent.com \
+  --type model \
+  --as-product \
+  --higress-console-url http://console.higress.io \
+  --higress-console-user admin \
+  --higress-console-password password \
+  --himarket-admin-url http://himarket.io \
+  --himarket-admin-user admin \
+  --himarket-admin-password password
+```
+
+## 配置管理
+
+### 配置文件
+
+配置文件位置：`~/.hgctl`
+
+```json
+{
+  "hgctl-agent-core": "claude",
+  "agent-chat-model": "qwen-plus",
+  "agent-model-provider": "DashScope",
+  "higress-console-url": "http://127.0.0.1:8080",
+  "higress-console-user": "admin",
+  "higress-console-password": "admin",
+  "higress-gateway-url": "http://127.0.0.1:80",
+  "himarket-admin-url": "",
+  "himarket-admin-user": "",
+  "himarket-admin-password": "",
+  "agentrun-model-name": "",
+  "agentrun-region": "cn-hangzhou"
+}
+```
+
+### 配置项说明
+
+| 配置项 | 说明 | 默认值 |
+|--------|------|--------|
+| `hgctl-agent-core` | Agentic Core 类型 | `qodercli` |
+| `agent-chat-model` | 默认聊天模型 | - |
+| `agent-model-provider` | 默认模型提供商 | - |
+| `higress-console-url` | Higress 控制台地址 | - |
+| `higress-console-user` | Higress 用户名 | - |
+| `higress-console-password` | Higress 密码 | - |
+| `higress-gateway-url` | Higress 网关地址 | - |
+| `himarket-admin-url` | Himarket 管理地址 | - |
+| `himarket-admin-user` | Himarket 用户名 | - |
+| `himarket-admin-password` | Himarket 密码 | - |
+| `agentrun-model-name` | AgentRun 模型名 | - |
+| `agentrun-region` | AgentRun 区域 | `cn-hangzhou` |
+
+### 环境变量
+
+配置也可以通过环境变量设置（自动转换，用下划线替换连字符）：
+
+```bash
+export HIGRESS_CONSOLE_URL=http://127.0.0.1:8080
+export HIGRESS_CONSOLE_USER=admin
+export HIGRESS_CONSOLE_PASSWORD=admin
+```
+
+**代码位置**: `config.go:100` - `InitConfig()`
+
+## 部署方式
+
+### 本地部署 (Local)
+
+#### 技术栈
+- **Runtime**: AgentScope Runtime
+- **Python**: 3.12+
+- **依赖**:
+  - `agentscope`
+  - `agentscope-runtime==1.0.0`
+
+#### 部署流程
+1. 检查 Python 环境
+2. 创建/激活虚拟环境 (`~/.hgctl/.venv`)
+3. 安装依赖
+4. 启动 Agent 服务
+
+#### 生成的文件
+```
+~/.hgctl/agents/{agent-name}/
+├── as_runtime_main.py    # AgentScope Runtime 入口
+├── agent.py              # Agent 类定义
+├── toolkit.py            # 工具集
+├── prompt.md             # 系统 Prompt
+├── CLAUDE.md             # Claude 开发指南（如果使用 Claude）
+└── AGENTS.md             # Qoder 开发指南（如果使用 Qodercli）
+```
+
+**代码位置**: `deploy.go:350` - `HandleLocal()`
+
+### 云端部署 (AgentRun)
+
+#### 技术栈
+- **平台**: 阿里云函数计算 (Function Compute)
+- **SDK**: agentrun-sdk-python
+- **工具**: Serverless Devs CLI
+
+#### 部署流程
+1. 检查环境（Docker、Serverless Devs）
+2. 检查/配置 Access Key
+3. 执行 `s build`
+4. 执行 `s deploy`
+
+#### 生成的文件
+```
+~/.hgctl/agents/{agent-name}/
+├── agentrun_main.py      # AgentRun 入口
+├── agent.py              # Agent 类定义
+├── toolkit.py            # 工具集
+├── prompt.md             # 系统 Prompt
+├── requirements.txt      # Python 依赖
+└── s.yaml                # Serverless Devs 配置
+```
+
+#### s.yaml 配置
+```yaml
+edition: 3.0.0
+name: {agent-name}
+access: hgctl-credential
+
+resources:
+  fc-agentrun-demo:
+    component: fc3
+    props:
+      region: {region}
+      description: {description}
+      runtime: python3.12
+      code: ./
+      handler: agentrun_main.main
+      timeout: {timeout}
+      diskSize: {disk-size}
+      environmentVariables:
+        MODEL_NAME: {model-name}
+        {api-key-env}: {api-key}
+      customRuntimeConfig:
+        command:
+          - python3
+        args:
+          - agentrun_main.py
+        port: {port}
+```
+
+**代码位置**: `deploy.go:305` - `HandleAgentRun()`
+
+## 集成说明
+
+### Higress 集成
+
+#### Service Source 创建
+```go
+// services/utils.go
+func BuildServiceBodyAndSrv(name, rawURL string) (map[string]interface{}, string, int, error)
+```
+
+创建服务源：
+- 解析 URL
+- 提取域名、端口
+- 生成服务名称
+
+#### AI Provider 和 Route 创建
+
+对于 MODEL 类型的 Agent：
+```go
+// services/utils.go
+func BuildAIProviderServiceBody(name, url string) map[string]interface{}
+func BuildAddAIRouteBody(name, url string) map[string]interface{}
+```
+
+#### MCP Server 创建
+
+支持两种类型：
+- **DIRECT_ROUTE**: 直接路由到 MCP Server URL
+- **OPEN_API**: 基于 OpenAPI 规范的工具配置
+
+### Himarket 集成
+
+#### API Product 创建
+```go
+// services/utils.go
+func BuildAPIProductBody(name, desc string, typ string) map[string]interface{}
+```
+
+#### Product Reference
+```go
+func BuildRefModelAPIProductBody(gatewayId, productId, routeName string) map[string]interface{}
+func BuildRefMCPAPIProductBody(gatewayId, productId, mcpServerName string) map[string]interface{}
+```
+
+### Agentic Core 集成
+
+#### 初始化流程
+1. 提取 manifest 文件到 `~/.hgctl/`
+2. 提取 Core 相关文件到 `~/.claude/` 或 `~/.qoder/`
+3. 添加预定义的 MCP Server
+4. 自动配置 Higress API MCP Server
+
+#### MCP Server 添加
+```bash
+{core} mcp add --transport {transport} {name} {url} \
+  --scope {scope} \
+  -e {env} \
+  -H {header}
+```
+
+**代码位置**: `core.go:236` - `AddMCPServer()`
+
+## 类型定义 (types.go)
+
+### API 请求/响应类型
+
+用于与 AI 模型 API 交互：
+
+```go
+type Message struct {
+    Role    string `json:"role"`
+    Content string `json:"content"`
+}
+
+type Request struct {
+    Model            string    `json:"model"`
+    Messages         []Message `json:"messages"`
+    FrequencyPenalty float64   `json:"frequency_penalty"`
+    PresencePenalty  float64   `json:"presence_penalty"`
+    Stream           bool      `json:"stream"`
+    Temperature      float64   `json:"temperature"`
+    Topp             int32     `json:"top_p"`
+}
+
+type Response struct {
+    ID      string   `json:"id"`
+    Choices []Choice `json:"choices"`
+    Created int64    `json:"created"`
+    Model   string   `json:"model"`
+    Object  string   `json:"object"`
+    Usage   Usage    `json:"usage"`
+}
+```
+
+### OpenAPI 相关类型
+
+用于 OpenAPI 规范解析：
+
+```go
+type API struct {
+    OpenAPI    string     `yaml:"openapi"`
+    Info       Info       `yaml:"info"`
+    Servers    []Server   `yaml:"servers"`
+    Paths      Paths      `yaml:"paths"`
+    Components Components `yaml:"components"`
+}
+```
+
+## Services 子包
+
+### HigressClient
+
+Higress API 客户端：
+
+```go
+type HigressClient struct {
+    baseURL  string
+    username string
+    password string
+    client   *http.Client
+}
+```
+
+**主要方法**:
+- `Get(path string) ([]byte, error)`
+- `Post(path string, body interface{}) ([]byte, error)`
+- `Put(path string, body interface{}) ([]byte, error)`
+
+### HimarketClient
+
+Himarket API 客户端：
+
+```go
+type HimarketClient struct {
+    baseURL  string
+    username string
+    password string
+    client   *http.Client
+}
+```
+
+**主要方法**:
+- `GetDevMCPServerProduct() (map[string]string, error)`
+- `GetDevModelProduct() (map[string]string, error)`
+
+## 工具函数 (utils.go)
+
+### Kubernetes 相关
+
+- `GetHigressGatewayServiceIP()`: 获取 Higress Gateway Service IP
+- `extractServiceIP()`: 从 Service 提取 IP
+- `getConsoleCredentials()`: 从 K8s Secret 获取控制台凭证
+
+### Agent 配置
+
+- `getAgentConfig()`: 交互式获取 Agent 配置
+- `createAgentStepByStep()`: 逐步创建 Agent
+- `importAgentFromCore()`: 从 Core 导入 Agent
+
+### Query 函数
+
+一系列用于交互式配置查询的函数：
+- `queryAgentSysPrompt()`: 查询系统 Prompt
+- `queryAgentTools()`: 查询工具选择
+- `queryAgentModel()`: 查询模型配置
+- `queryAgentMCP()`: 查询 MCP Server
+- `queryDeploySettings()`: 查询部署设置
+
+## 最佳实践
+
+### 1. 开发流程
+
+```bash
+# 1. 创建 Agent
+hgctl agent new
+
+# 2. 使用 Core 改进和测试
+# 选择 "Improve and test it using agentic core"
+
+# 3. 部署 Agent
+hgctl agent deploy my-agent
+
+# 4. 添加到 Higress
+hgctl agent add my-agent http://localhost:8090 --type model
+
+# 5. （可选）发布到 Himarket
+hgctl agent add my-agent http://localhost:8090 --type model --as-product
+```
+
+### 2. MCP Server 管理
+
+```bash
+# 添加 HTTP MCP Server
+hgctl mcp add my-mcp http://mcp-server:8080/mcp
+
+# 从 OpenAPI 创建 MCP Server
+hgctl mcp add swagger-mcp ./openapi.yaml --type openapi
+
+# 添加到 Higress 和 Himarket
+hgctl mcp add my-mcp http://mcp-server:8080/mcp --as-product
+```
+
+### 3. 配置管理
+
+```bash
+# 使用配置文件
+vim ~/.hgctl
+
+# 或使用环境变量
+export HIGRESS_CONSOLE_URL=http://127.0.0.1:8080
+export HIGRESS_CONSOLE_USER=admin
+export HIGRESS_CONSOLE_PASSWORD=admin
+```
+
+## 错误处理
+
+### 常见错误
+
+1. **Node.js 未安装**
+   - 自动提示安装选项
+   - 支持自动安装（fnm）
+
+2. **Agentic Core 未安装**
+   - 自动提示安装选项
+   - 支持自动安装（npm）
+
+3. **Python 环境问题**
+   - 自动创建虚拟环境
+   - 自动安装依赖
+
+4. **Kubernetes 连接问题**
+   - 提供手动输入 kubeconfig 选项
+   - 支持自定义 namespace
+
+5. **Higress/Himarket 认证失败**
+   - 检查配置文件
+   - 检查环境变量
+   - 尝试从 K8s Secret 自动获取
+
+## 扩展开发
+
+### 添加新的 Agentic Core
+
+1. 在 `config.go` 中添加新的 CoreType
+2. 在 `core.go` 中实现相应的方法
+3. 更新 `EnvProvisioner` 支持新的安装方式
+
+### 添加新的部署类型
+
+1. 在 `deploy.go` 中添加新的 DeployType
+2. 实现相应的部署处理方法
+3. 更新模板生成逻辑
+
+### 添加新的 API 类型
+
+1. 在 `agent.go` 中添加新的 API Type 常量
+2. 在 `publishAgentAPIToHigress()` 中添加处理逻辑
+3. 在 `services/utils.go` 中添加相应的构建函数
+
+## 依赖说明
+
+### Go 依赖
+- `github.com/spf13/cobra`: CLI 框架
+- `github.com/spf13/viper`: 配置管理
+- `github.com/AlecAivazis/survey/v2`: 交互式问答
+- `github.com/fatih/color`: 终端颜色输出
+- `k8s.io/client-go`: Kubernetes 客户端
+
+### 外部工具
+- **Node.js 18+**: Agentic Core 运行环境
+- **Claude Code / Qodercli**: Agentic Core
+- **Python 3.12+**: Agent Runtime
+- **Docker**: AgentRun 部署
+- **Serverless Devs CLI**: AgentRun 部署工具
+
+## 参考资源
+
+- [AgentScope 文档](https://modelscope.github.io/agentscope/)
+- [Claude Code 文档](https://docs.claude.com/en/docs/claude-code/setup)
+- [Qoder 文档](https://docs.qoder.com/zh/cli/quick-start)
+- [Serverless Devs 文档](https://serverless-devs.com/docs/user-guide/install)
+- [Higress 文档](https://higress.io/)
+- [AgentRun 文档](https://github.com/Serverless-Devs/agentrun-sdk-python)
+
+## License
+
+Copyright (c) 2025 Alibaba Group Holding Ltd.
+
+Licensed under the Apache License, Version 2.0

hgctl/pkg/agent/agent.go

@@ -0,0 +1,175 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/alibaba/higress/hgctl/pkg/agent/services"
+	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+)
+
+// API Type
+const (
+	A2A   = "a2a"
+	REST  = "restful"
+	MODEL = "model"
+)
+
+func NewAgentCmd() *cobra.Command {
+	agentCmd := &cobra.Command{
+		Use:   "agent",
+		Short: "Start the interactive agent window",
+		Run: func(cmd *cobra.Command, args []string) {
+			cmdutil.CheckErr(invokeAgentCore(cmd.OutOrStdout()))
+		},
+	}
+
+	agentCmd.AddCommand(createAgentCmd())
+	agentCmd.AddCommand(deployAgentCmd())
+	agentCmd.AddCommand(newAgentAddCmd())
+
+	return agentCmd
+}
+
+func invokeAgentCore(w io.Writer) error {
+	core, err := getCore()
+	if err != nil {
+		return fmt.Errorf("failed to get core: %s", err)
+	}
+	return core.Start()
+}
+
+type AgentAddArg struct {
+	HigressConsoleAuthArg
+	HimarketAdminAuthArg
+
+	name  string
+	url   string
+	typ   string
+	scope string
+
+	asProduct bool
+	noPublish bool
+}
+
+func newAgentAddCmd() *cobra.Command {
+	arg := &AgentAddArg{}
+
+	cmd := &cobra.Command{
+		Use:   "add [name] [url]",
+		Short: "add agent to local interactive window and publish it to higress (optional)",
+		Run: func(cmd *cobra.Command, args []string) {
+			arg.name = args[0]
+			arg.url = args[1]
+
+			resolveHigressConsoleAuth(&arg.HigressConsoleAuthArg)
+			resolveHimarketAdminAuth(&arg.HimarketAdminAuthArg)
+			cmdutil.CheckErr(handleAddAgent(cmd.OutOrStdout(), *arg))
+		},
+		Args: cobra.ExactArgs(2),
+	}
+
+	cmd.PersistentFlags().StringVarP(&arg.typ, "type", "t", MODEL, "Determine the agent's API type (a2a, model, restful) default is model")
+	cmd.PersistentFlags().StringVarP(&arg.scope, "scope", "s", "project", `Configuration scope (project or global)`)
+	cmd.PersistentFlags().BoolVar(&arg.noPublish, "no-publish", false, "If it's set then the agent API will not be plubished to Higress")
+	cmd.PersistentFlags().BoolVar(&arg.asProduct, "as-product", false, "If it's set then the agent API will be published to Himarket (no-publish must be false)")
+
+	addHigressConsoleAuthFlag(cmd, &arg.HigressConsoleAuthArg)
+	addHimarketAdminAuthFlag(cmd, &arg.HimarketAdminAuthArg)
+	return cmd
+}
+
+func handleAddAgent(writer io.Writer, arg AgentAddArg) error {
+	if err := validateArg(arg); err != nil {
+		return err
+	}
+
+	if !arg.noPublish {
+		if err := publishAgentAPIToHigress(arg); err != nil {
+			fmt.Printf("failed to publish agent api to higress: %s\n", err)
+			return err
+		}
+
+		fmt.Printf("Agent %s is published to Higress successfully\n", arg.name)
+
+		if arg.asProduct {
+			if err := publishAPIToHimarket(arg.typ, arg.name, arg.HimarketAdminAuthArg); err != nil {
+				fmt.Println("failed to publish it to himarket, please do it mannually")
+				return err
+			}
+			fmt.Printf("Agent %s is published to Himarket successfully\n", arg.name)
+		}
+		// TODO: pop up higress window
+	}
+
+	return nil
+}
+
+func publishAgentAPIToHigress(arg AgentAddArg) error {
+	client := services.NewHigressClient(arg.hgURL, arg.hgUser, arg.hgPassword)
+
+	switch arg.typ {
+	case A2A:
+	case MODEL:
+		// add ai service
+		body := services.BuildAIProviderServiceBody(arg.name, arg.url)
+		// Debug
+		// fmt.Printf("services: body: %v\n", body)
+		if resp, err := services.HandleAddAIProviderService(client, body); err != nil {
+			fmt.Println(string(resp))
+			return err
+		}
+
+		// add ai route
+		body = services.BuildAddAIRouteBody(arg.name, arg.url)
+		// fmt.Printf("Route body: %v\n", body)
+		if res, err := services.HandleAddAIRoute(client, body); err != nil {
+			fmt.Println(string(res))
+			return err
+		}
+
+	case REST:
+		srvName := fmt.Sprintf("agent-%s", arg.name)
+		body, targetSrvName, _, err := services.BuildServiceBodyAndSrv(srvName, arg.url)
+		if err != nil {
+			return fmt.Errorf("invalid url format: %s", err)
+		}
+
+		if resp, err := services.HandleAddServiceSource(client, body); err != nil {
+			fmt.Println(string(resp))
+			return err
+		}
+
+		if resp, err := services.HandleAddRoute(client, services.BuildAPIRouteBody(arg.name, targetSrvName)); err != nil {
+			fmt.Println(string(resp))
+			return err
+		}
+	default:
+		return fmt.Errorf("unsupported agent protocol type: %s", arg.typ)
+
+	}
+
+	return nil
+}
+
+func validateArg(arg AgentAddArg) error {
+	if !arg.noPublish {
+		return arg.HigressConsoleAuthArg.validate()
+	}
+	return nil
+}

hgctl/pkg/agent/base.go

@@ -0,0 +1,487 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/alibaba/higress/hgctl/pkg/agent/common"
+	"github.com/alibaba/higress/hgctl/pkg/agent/services"
+	"github.com/fatih/color"
+	"github.com/spf13/viper"
+)
+
+const (
+	NodeLeastVersion = 18
+)
+
+type HimarketAdminAuthArg struct {
+	hmURL      string
+	hmUser     string
+	hmPassword string
+}
+
+// Developer's page
+type HimarketDevAuthArg struct {
+	hmURL      string
+	hmUser     string
+	hmPassword string
+}
+
+func (h *HimarketAdminAuthArg) validate() error {
+	if h.hmURL == "" || h.hmUser == "" || h.hmPassword == "" {
+		return fmt.Errorf("invalid args")
+	}
+	return nil
+}
+
+type HigressConsoleAuthArg struct {
+	// higress console auth arg
+	hgURL      string
+	hgUser     string
+	hgPassword string
+}
+
+func (h *HigressConsoleAuthArg) validate() error {
+	if h.hgURL == "" || h.hgUser == "" || h.hgPassword == "" {
+		fmt.Println("--higress-console-user, --higress-console-url, --higress-console-password must be provided")
+		return fmt.Errorf("invalid args")
+	}
+	return nil
+}
+
+func init() {
+	// Init the global configuration from config file
+	InitConfig()
+}
+
+func resolveHimarketAdminAuth(arg *HimarketAdminAuthArg) {
+	if arg.hmURL == "" {
+		arg.hmURL = viper.GetString(HIMARKET_ADMIN_URL)
+	}
+	if arg.hmUser == "" {
+		arg.hmUser = viper.GetString(HIMARKET_ADMIN_USER)
+	}
+	if arg.hmPassword == "" {
+		arg.hmPassword = viper.GetString(HIMARKET_ADMIN_PASSWORD)
+	}
+}
+
+// resolve from viper
+func resolveHigressConsoleAuth(arg *HigressConsoleAuthArg) {
+	if arg.hgURL == "" {
+		arg.hgURL = viper.GetString(HIGRESS_CONSOLE_URL)
+	}
+	if arg.hgUser == "" {
+		arg.hgUser = viper.GetString(HIGRESS_CONSOLE_USER)
+	}
+	if arg.hgPassword == "" {
+		arg.hgPassword = viper.GetString(HIGRESS_CONSOLE_PASSWORD)
+	}
+
+	// fmt.Printf("arg: %v\n", arg)
+
+	if arg.hgUser == "" || arg.hgPassword == "" {
+		// Here we do not return this error, because it will failed when validate arg
+		if err := tryToGetLocalCredential(arg); err != nil {
+			fmt.Printf("failed to get local higress console credential: %s\n", err)
+		}
+	}
+}
+
+func parseTypeToAPIProductType(typ string) string {
+	switch typ {
+	case "a2a":
+		return string(common.AGENT_API)
+	case "restful":
+		return string(common.REST_API)
+	case "model":
+		return string(common.MODEL_API)
+	case "mcp":
+		return string(common.MCP_SERVER)
+	default:
+		return ""
+	}
+}
+
+// This function serves MCP API as well as Model API for now.
+func publishAPIToHimarket(typ, name string, arg HimarketAdminAuthArg) error {
+
+	if err := arg.validate(); err != nil {
+		return err
+	}
+
+	client := services.NewHimarketClient(arg.hmURL, arg.hmUser, arg.hmPassword)
+
+	productName := fmt.Sprintf("%s-%s", typ, name)
+
+	var gatewayId = viper.GetString(HIMARKET_TARGET_HIGRESS_ID)
+	prompt := survey.Input{
+		Message: fmt.Sprintf("Enter the target Higress instance id on Himarket(%s):", gatewayId),
+		Default: gatewayId,
+		Help:    fmt.Sprintf("refers to %s/consoles/gateway to get your target Higress instance's id", arg.hmURL),
+	}
+
+	if err := survey.AskOne(&prompt, &gatewayId); err != nil {
+		return fmt.Errorf("failed to get target higress gatewayID: %s", err)
+	}
+
+	body := services.BuildAPIProductBody(productName, "An agent API import by hgctl", parseTypeToAPIProductType(typ))
+	resp, err := services.HandleAddAPIProduct(client, body)
+	if err != nil {
+		fmt.Println(resp)
+		return err
+	}
+
+	product_id := string(resp)
+	var refBody map[string]interface{}
+
+	if typ == "mcp" {
+		refBody = services.BuildRefMCPAPIProductBody(gatewayId, product_id, name)
+	} else {
+		// target_route is the route_name in Higress, refers to `publishAgentAPIToHigress`
+		target_route := fmt.Sprintf("%s-route", name)
+		refBody = services.BuildRefModelAPIProductBody(gatewayId, product_id, target_route)
+
+	}
+
+	if resp, err := services.HandleRefAPIProduct(client, product_id, refBody); err != nil {
+		fmt.Println(string(resp))
+		return err
+	}
+
+	return nil
+}
+
+// use pre-defined command /gen-agent to generate sys prompt
+func generateAgentPromptByCore(desc string) (string, error) {
+	core := NewAgenticCore()
+	prompt, err := core.runWithResult(fmt.Sprintf("/gen-agent %s", desc), "--print")
+	if err != nil {
+		return "", err
+	}
+	return prompt, nil
+}
+
+type EnvProvisioner struct {
+	core        CoreType
+	installCmd  string
+	releasePage string
+
+	// ~/.<core>
+	dirName string
+}
+
+func getCore() (*AgenticCore, error) {
+	provisioner := EnvProvisioner{
+		core: CoreType(viper.GetString(HGCTL_AGENT_CORE)),
+	}
+
+	if err := provisioner.check(); err != nil {
+		return nil, fmt.Errorf("⚠️ Prerequisites not satisfied: %s Exiting...", err)
+	}
+
+	return NewAgenticCore(), nil
+}
+
+func (p *EnvProvisioner) init() {
+	switch p.core {
+	case CORE_QODERCLI:
+		p.installCmd = "npm install -g @qoder-ai/qodercli"
+		p.releasePage = "https://docs.qoder.com/zh/cli/quick-start"
+		p.dirName = "qoder"
+
+	case CORE_CLAUDE:
+		p.installCmd = "npm install -g @anthropic-ai/claude-code"
+		p.releasePage = "https://docs.claude.com/en/docs/claude-code/setup"
+		p.dirName = "claude"
+	}
+}
+
+func (p *EnvProvisioner) check() error {
+	p.init()
+
+	if !p.checkNodeInstall() {
+		if err := p.promptNodeInstall(); err != nil {
+			return err
+		}
+	}
+
+	if !p.checkAgentInstall() {
+		if err := p.promptAgentInstall(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (p *EnvProvisioner) checkNodeInstall() bool {
+	cmd := exec.Command("node", "-v")
+	out, err := cmd.Output()
+	if err != nil {
+		return false
+	}
+
+	versionStr := strings.TrimPrefix(strings.TrimSpace(string(out)), "v")
+	parts := strings.Split(versionStr, ".")
+	if len(parts) == 0 {
+		return false
+	}
+
+	major, err := strconv.Atoi(parts[0])
+	if err != nil {
+		return false
+	}
+
+	return major >= NodeLeastVersion
+}
+
+func (p *EnvProvisioner) promptNodeInstall() error {
+	fmt.Println()
+	color.Yellow("⚠️ Node.js is not installed or not found in PATH.")
+	color.Cyan("🔧 Node.js is required to run the agent.")
+	fmt.Println()
+
+	options := []string{
+		"🚀 Install automatically (recommended)",
+		"📖 Exit and show manual installation guide",
+	}
+
+	var ans string
+	prompt := &survey.Select{
+		Message: "How would you like to install Node.js?",
+		Options: options,
+	}
+	if err := survey.AskOne(prompt, &ans); err != nil {
+		return fmt.Errorf("selection error: %w", err)
+	}
+
+	switch ans {
+	case options[0]:
+		fmt.Println()
+		color.Green("🚀 Installing Node.js automatically...")
+
+		if err := p.installNodeAutomatically(); err != nil {
+			color.Red("❌ Installation failed: %v", err)
+			fmt.Println()
+			p.showNodeManualInstallation()
+			return errors.New("node.js installation failed")
+		}
+
+		color.Green("✅ Node.js installation completed!")
+		fmt.Println()
+		color.Blue("🔍 Verifying installation...")
+
+		if p.checkNodeInstall() {
+			color.Green("🎉 Node.js is now available!")
+			return nil
+		} else {
+			color.Yellow("⚠️ Node.js installation completed but not found in PATH.")
+			color.Cyan("💡 You may need to restart your terminal or source your shell profile.")
+			return errors.New("node.js installed but not in PATH")
+		}
+
+	case options[1]:
+		p.showNodeManualInstallation()
+		return errors.New("node.js not installed")
+
+	default:
+		return errors.New("invalid selection")
+	}
+}
+
+func (p *EnvProvisioner) installNodeAutomatically() error {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return fmt.Errorf("could not get home directory: %w", err)
+	}
+
+	fnmBinPath := filepath.Join(homeDir, ".local/share/fnm/fnm")
+	if runtime.GOOS == "windows" {
+		fnmBinPath = filepath.Join(homeDir, "AppData/Roaming/fnm/fnm.exe")
+	}
+
+	switch runtime.GOOS {
+	case "windows":
+		color.Cyan("📦 For Windows, we recommend installing fnm via: 'winget install Schniz.fnm'")
+		return errors.New("automatic fnm installation on Windows is not implemented in this script")
+
+	case "darwin", "linux":
+		color.Cyan("🚀 Installing fnm (Fast Node Manager)...")
+		installFnmCmd := exec.Command("bash", "-c", "curl -fsSL https://fnm.vercel.app/install | bash -s -- --skip-shell")
+		installFnmCmd.Stdout = os.Stdout
+		installFnmCmd.Stderr = os.Stderr
+		if err := installFnmCmd.Run(); err != nil {
+			return fmt.Errorf("failed to install fnm: %w", err)
+		}
+
+		if _, err := os.Stat(fnmBinPath); os.IsNotExist(err) {
+			path, err := exec.LookPath("fnm")
+			if err == nil {
+				fnmBinPath = path
+			} else {
+				return errors.New("fnm was installed but binary not found at " + fnmBinPath)
+			}
+		}
+
+		color.Cyan("📦 Installing Node.js via fnm...")
+		installNodeCmd := exec.Command(fnmBinPath, "install", "--lts")
+		installNodeCmd.Stdout = os.Stdout
+		installNodeCmd.Stderr = os.Stderr
+		if err := installNodeCmd.Run(); err != nil {
+			return fmt.Errorf("failed to install node via fnm: %w", err)
+		}
+
+		color.Cyan("✅ Setting LTS as default Node.js version...")
+		useNodeCmd := exec.Command(fnmBinPath, "default", "lts-latest")
+		return useNodeCmd.Run()
+
+	default:
+		return errors.New("unsupported OS for automatic installation")
+	}
+}
+
+func (p *EnvProvisioner) showNodeManualInstallation() {
+	fmt.Println()
+
+	color.New(color.FgGreen, color.Bold).Println("📖 Manual Node.js Installation Guide")
+	fmt.Println()
+
+	fmt.Println(color.MagentaString("Choose one of the following installation methods:"))
+	fmt.Println()
+
+	color.Cyan("Method 1: Install via package manager")
+	color.Cyan("macOS (brew): brew install node")
+	color.Cyan("Ubuntu/Debian: sudo apt install -y nodejs npm")
+	color.Cyan("Windows: download from https://nodejs.org and run installer")
+	fmt.Println()
+
+	color.Yellow("Method 2: Download from official website")
+	color.Yellow("1. Download Node.js from https://nodejs.org/en/download/")
+	color.Yellow("2. Follow installer instructions and add to PATH if needed")
+	fmt.Println()
+
+	color.Green("✅ Verify Installation")
+	fmt.Println(color.WhiteString("node -v"))
+	fmt.Println(color.WhiteString("npm -v"))
+	fmt.Println()
+
+	color.Cyan("💡 After installation, restart your terminal or source your shell profile.")
+	fmt.Println()
+}
+
+func (p *EnvProvisioner) checkAgentInstall() bool {
+	cmd := exec.Command(string(p.core), "--version")
+	if err := cmd.Run(); err != nil {
+		return false
+	}
+	return true
+}
+
+func (p *EnvProvisioner) promptAgentInstall() error {
+	fmt.Println()
+	color.Yellow("⚠️ %s is not installed or not found in PATH.", p.core)
+	color.Cyan("🔧 %s is required to run the agent.", p.core)
+	fmt.Println()
+
+	options := []string{
+		"🚀 Install automatically",
+		"📖 Exit and show manual installation guide",
+	}
+
+	var ans string
+	prompt := &survey.Select{
+		Message: "How would you like to install " + string(p.core) + "?",
+		Options: options,
+	}
+	if err := survey.AskOne(prompt, &ans); err != nil {
+		return fmt.Errorf("selection error: %w", err)
+	}
+
+	switch ans {
+	case options[0]:
+		fmt.Println()
+		color.Green("🚀 Installing %s automatically...", p.core)
+
+		if err := p.installAgentAutomatically(); err != nil {
+			color.Red("❌ Installation failed: %v", err)
+			fmt.Println()
+			p.showAgentManualInstallation()
+			return errors.New(string(p.core) + " installation failed")
+		}
+		fmt.Println()
+		color.Blue("🔍 Verifying installation...")
+
+		if p.checkAgentInstall() {
+			color.Green("🎉 %s is now available!", p.core)
+			return nil
+		} else {
+			color.Yellow("⚠️ %s installed but not found in PATH.", p.core)
+			color.Cyan("💡 You may need to restart your terminal or source your shell profile.")
+			return errors.New(string(p.core) + " installed but not in PATH")
+		}
+
+	case options[1]:
+		p.showAgentManualInstallation()
+		return errors.New(string(p.core) + " not installed")
+
+	default:
+		return errors.New("invalid selection")
+	}
+}
+
+func (p *EnvProvisioner) installAgentAutomatically() error {
+	switch runtime.GOOS {
+	case "windows":
+		cmd := exec.Command("cmd", "/C", p.installCmd)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
+	case "darwin":
+		cmd := exec.Command("bash", "-c", p.installCmd)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
+	case "linux":
+		cmd := exec.Command("bash", "-c", p.installCmd)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
+	default:
+		return errors.New("unsupported OS for automatic installation")
+	}
+}
+
+func (p *EnvProvisioner) showAgentManualInstallation() {
+	fmt.Println()
+	color.New(color.FgGreen, color.Bold).Printf("📖 Manual %s Installation Guide\n", p.core)
+	fmt.Println()
+
+	color.Cyan(fmt.Sprintf("1. Go to official release page: %s", p.releasePage))
+	fmt.Printf(color.CyanString("2. Download %s for your OS\n"), p.core)
+	color.Cyan("3. Make it executable and place it in a directory in your PATH")
+
+	fmt.Println()
+	color.Cyan("💡 After installation, restart your terminal or source your shell profile.")
+	fmt.Println()
+}

hgctl/pkg/agent/common/base.go

@@ -0,0 +1,25 @@
+// Copyright (c) 2022 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+// Himarket Product Type
+type ProductType string
+
+const (
+	MCP_SERVER ProductType = "MCP_SERVER"
+	MODEL_API  ProductType = "MODEL_API"
+	REST_API   ProductType = "REST_API"
+	AGENT_API  ProductType = "AGENT_API"
+)

hgctl/pkg/agent/config.go

@@ -0,0 +1,129 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/mitchellh/go-homedir"
+	"github.com/spf13/viper"
+)
+
+type CoreType string
+
+const (
+	CORE_CLAUDE   CoreType = "claude"
+	CORE_QODERCLI CoreType = "qodercli"
+)
+
+const (
+	// AgentBinaryName  = "claude"
+	// BinaryVersion    = "0.1.0"
+	// DevVersion       = "dev"
+	// NodeLeastVersion = 18
+	// AgentInstallCmd  = "npm install -g @anthropic-ai/claude-code"
+	// AgentReleasePage = "https://docs.claude.com/en/docs/claude-code/setup"
+
+	HGCTL_AGENT_CORE         = "hgctl-agent-core"
+	AGENT_MODEL_PROVIDER     = "agent-model-provider"
+	AGENT_CHAT_MODEL         = "agent-chat-model"
+	HIGRESS_CONSOLE_URL      = "higress-console-url"
+	HIGRESS_CONSOLE_USER     = "higress-console-user"
+	HIGRESS_CONSOLE_PASSWORD = "higress-console-password"
+	HIGRESS_GATEWAY_URL      = "higress-gateway-url"
+
+	HIMARKET_ADMIN_URL         = "himarket-admin-url"
+	HIMARKET_ADMIN_USER        = "himarket-admin-user"
+	HIMARKET_ADMIN_PASSWORD    = "himarket-admin-password"
+	HIMARKET_TARGET_HIGRESS_ID = "himarket-target-higress-id"
+
+	HIMARKET_DEVELOPER_URL      = "himarket-developer-url"
+	HIMARKET_DEVELOPER_USER     = "himarket-developer-user"
+	HIMARKET_DEVELOPER_PASSWORD = "himarket-developer-password"
+
+	// --- AgentRun ---
+	AGENTRUN_MODEL_NAME             = "agentrun-model-name"
+	AGENTRUN_SANDBOX_NAME           = "agentrun-sandbox-name"
+	ALIBABA_CLOUD_ACCESS_KEY_ID     = "alibaba-cloud-access-key-id"
+	ALIBABA_CLOUD_ACCESS_KEY_SECRET = "alibaba-cloud-access-key-secret"
+	ALIBABA_CLOUD_SECURITY_TOK      = "alibaba-cloud-security-tok"
+	AGENTRUN_ACCOUNT_ID             = "agentrun-account-id"
+	AGENTRUN_REGION                 = "agentrun-region"
+	AGENTRUN_SDK_DEB                = "agentrun-sdk-deb"
+)
+
+var GlobalConfig HgctlAgentConfig
+
+type HgctlAgentConfig struct {
+	AgenticCore        CoreType `mapstructure:"hgctl-agent-core"`
+	AgentChatModel     string   `mapstructure:"agent-chat-model"`
+	AgentModelProvider string   `mapstructure:"agent-model-provider"`
+
+	// Higress Console credentials
+	HigressConsoleURL      string `mapstructure:"higress-console-url"`
+	HigressConsoleUser     string `mapstructure:"higress-console-user"`
+	HigressConsolePassword string `mapstructure:"higress-console-password"`
+	HigressGatewayURL      string `mapstructure:"higress-gateway-url"`
+	// Himarket Admin credentials
+	HimarketAdminURL        string `mapstructure:"himarket-admin-url"`
+	HimarketAdminUser       string `mapstructure:"himarket-admin-user"`
+	HimarketAdminPassword   string `mapstructure:"himarket-admin-password"`
+	HimarketTargetHigressID string `mapstructure:"himarket-target-higress-id"`
+
+	// Himarket Developer credentials
+	HimarketDeveloperURL      string `mapstructure:"himarket-developer-url"`
+	HimarketDeveloperUser     string `mapstructure:"himarket-developer-user"`
+	HimarketDeveloperPassword string `mapstructure:"himarket-developer-password"`
+
+	// AgentRun Configuration
+	AgentRunModelName           string `mapstructure:"agentrun-model-name"`
+	AgentRunSandboxName         string `mapstructure:"agentrun-sandbox-name"`
+	AlibabaCloudAccessKeyID     string `mapstructure:"alibaba-cloud-access-key-id"`
+	AlibabaCloudAccessKeySecret string `mapstructure:"alibaba-cloud-access-key-secret"`
+	AlibabaCloudSecurityTok     string `mapstructure:"alibaba-cloud-security-tok"`
+	AgentRunAccountID           string `mapstructure:"agentrun-account-id"`
+	AgentRunRegion              string `mapstructure:"agentrun-region"`
+}
+
+func InitConfig() {
+	viper.SetConfigName(".hgctl")
+	viper.SetConfigType("json")
+
+	home, err := homedir.Dir()
+	if err != nil {
+		log.Fatalf("Error finding home directory: %v", err)
+	}
+
+	viper.AddConfigPath(home)
+
+	if err := viper.ReadInConfig(); err != nil {
+		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+			fmt.Fprintf(os.Stderr, "Fatal error reading config file: %v\n", err)
+		}
+	}
+
+	// Unmarshal into the GlobalConfig variable
+	_ = viper.Unmarshal(&GlobalConfig)
+
+	// Validate supported AgentCore currently
+	switch viper.GetString(HGCTL_AGENT_CORE) {
+	case string(CORE_CLAUDE), string(CORE_QODERCLI):
+		return
+	default:
+		viper.SetDefault(HGCTL_AGENT_CORE, string(CORE_QODERCLI))
+	}
+}

hgctl/pkg/agent/core.go

@@ -0,0 +1,267 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"encoding/base64"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/alibaba/higress/hgctl/pkg/manifests"
+	"github.com/alibaba/higress/hgctl/pkg/util"
+	"github.com/fatih/color"
+	"github.com/manifoldco/promptui"
+	"github.com/spf13/viper"
+)
+
+type AgenticCore struct {
+	binaryName string
+}
+
+func NewAgenticCore() *AgenticCore {
+	core := &AgenticCore{
+		binaryName: viper.GetString(HGCTL_AGENT_CORE),
+	}
+	core.Setup()
+	return core
+}
+
+func (c *AgenticCore) GetPromptFileName() string {
+	switch c.binaryName {
+	case string(CORE_CLAUDE):
+		return "CLAUDE.md"
+	case string(CORE_QODERCLI):
+		return "AGENTS.md"
+	}
+	return ""
+}
+
+func (c *AgenticCore) GetCoreDirName() string {
+	switch c.binaryName {
+	case string(CORE_CLAUDE):
+		return ".claude"
+	case string(CORE_QODERCLI):
+		return ".qoder"
+	}
+	return ""
+}
+
+// This will use core to test and improve created agent
+func (c *AgenticCore) ImproveNewAgent(config *AgentConfig) error {
+	agentDir, err := util.GetSpecificAgentDir(config.AgentName)
+	if err != nil {
+		return fmt.Errorf("failed to get agent directory: %s", agentDir)
+	}
+	return c.runInTargetDir(agentDir)
+}
+
+func (c *AgenticCore) runInTargetDir(dir string, args ...string) error {
+	cmd := exec.Command(c.binaryName, args...)
+	cmd.Dir = dir
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+
+}
+
+func (c *AgenticCore) runWithResult(args ...string) (string, error) {
+	cmd := exec.Command(c.binaryName, args...)
+
+	output, err := cmd.Output()
+	if err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			return "", fmt.Errorf("agent execution failed with exit code %d: %s\nStderr: %s",
+				exitErr.ExitCode(), err.Error(), exitErr.Stderr)
+		}
+		return "", fmt.Errorf("failed to run agent: %w", err)
+	}
+
+	return string(output), nil
+}
+
+func (c *AgenticCore) run(args ...string) error {
+	cmd := exec.Command(c.binaryName, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
+// setup additional prequisite environment and plugins manifest to user's profile
+// e.g. ../manifest/agent
+func (c *AgenticCore) Setup() {
+	// Check if this is the first time, otherwise directly return (TODO: this is a simple check)
+	homeDir, _ := os.UserHomeDir()
+	targetCtlDir := filepath.Join(homeDir, ".hgctl")
+	if _, err := os.Stat(targetCtlDir); err == nil {
+		return
+	}
+
+	targetCoreDir := filepath.Join(homeDir, c.GetCoreDirName())
+
+	// setup subagent plugins file
+	embedFS := manifests.BuiltinOrDir("")
+	if err := manifests.ExtractEmbedFiles(embedFS, "agent", targetCtlDir); err != nil {
+		fmt.Println(err)
+		fmt.Println("failed to init plugins for agent core")
+		os.Exit(1)
+	}
+
+	// Setup predefined files like: command.md
+	if err := manifests.ExtractEmbedFiles(embedFS, "agent", targetCoreDir); err != nil {
+		fmt.Println(err)
+		fmt.Println("failed to init commands for agent core")
+		os.Exit(1)
+	}
+
+	// Add Predefined MCP Server
+	if err := c.addPredefinedMCP(); err != nil {
+		fmt.Printf("Warning: failed to add needed mcp server: %s\n", err)
+	}
+
+	if err := c.addHigressAPIMCP(); err != nil {
+		fmt.Println("failed to init higress-api mcp server (you may need to add it manually):", err)
+		fmt.Println("Details information on Higress-api MCP server refers to https://github.com/alibaba/higress/blob/main/plugins/golang-filter/mcp-server/servers/higress/higress-api/README_en.md")
+		return
+	}
+	// fmt.Println("Higress-api MCP server added successfully")
+}
+
+func (c *AgenticCore) addPredefinedMCP() error {
+	// deepwikiArg := MCPAddArg{
+	// 	name:      "deepwiki",
+	// 	url:       "https://mcp.deepwiki.com/mcp",
+	// 	typ:       "",
+	// 	transport: STREAMABLE,
+	// 	scope:     "user",
+	// }
+	// if err := c.AddMCPServer(deepwikiArg); err != nil {
+	// 	return fmt.Errorf("deepwiki")
+	// }
+
+	return nil
+}
+
+func (c *AgenticCore) addHigressAPIMCP() error {
+	arg := &HigressConsoleAuthArg{
+		hgURL:      viper.GetString(HIGRESS_GATEWAY_URL),
+		hgUser:     viper.GetString(HIGRESS_CONSOLE_USER),
+		hgPassword: viper.GetString(HIGRESS_CONSOLE_PASSWORD),
+	}
+	fmt.Println("Initializing...Add prequisite MCP server (Higress-api MCP server) automatically")
+
+	if arg.hgURL == "" {
+		gatewayPrompt := promptui.Prompt{
+			Label:   "Enter higress gateway URL",
+			Default: "http://127.0.0.1:80",
+		}
+		gateway, err := gatewayPrompt.Run()
+		if err != nil {
+			fmt.Println("failed to run gateway prompt: ", err)
+			return err
+		}
+		arg.hgURL = gateway
+
+	}
+
+	if arg.hgURL == "" || arg.hgPassword == "" {
+		if err := tryToGetLocalCredential(arg); err != nil || arg.hgUser == "" || arg.hgPassword == "" {
+			// fallback: interact with user to provide password & username
+			color.Red("failed to get higress-console credential automatically (Requires higress installed by hgctl). Let's do it manually")
+			userPrompt := promptui.Prompt{
+				Label:   "Enter higress console username",
+				Default: "admin",
+			}
+			username, err := userPrompt.Run()
+			if err != nil {
+				return fmt.Errorf("aborted: %v", err)
+			}
+			pwdPrompt := promptui.Prompt{
+				Label:   "Enter higress console password",
+				Default: "admin",
+			}
+			pwd, err := pwdPrompt.Run()
+			if err != nil {
+				return fmt.Errorf("aborted: %v", err)
+			}
+			arg.hgUser = username
+			arg.hgPassword = pwd
+		}
+	}
+
+	if arg.hgUser == "" || arg.hgPassword == "" {
+		return fmt.Errorf("Empty higress console username and password, aborting")
+	}
+
+	rawByte := fmt.Appendf(nil, "%s:%s", arg.hgUser, arg.hgPassword)
+
+	resStr := base64.StdEncoding.EncodeToString(rawByte)
+
+	authHeader := fmt.Sprintf("Authorization: Basic %s", resStr)
+
+	return c.AddMCPServer(MCPAddArg{
+		name:      "higress-api",
+		url:       fmt.Sprintf("%s/higress-api", arg.hgURL),
+		transport: HTTP,
+		typ:       HTTP,
+		scope:     "user",
+		header: []string{
+			authHeader,
+		},
+	})
+}
+
+// ------- Initialization  -------
+func (c *AgenticCore) Start() error {
+	return c.run()
+}
+
+// ------- MCP  -------
+func (c *AgenticCore) AddMCPServer(arg MCPAddArg) error {
+	// adapt the field
+	if arg.transport == STREAMABLE {
+		arg.transport = HTTP
+	}
+	args := []string{
+		"mcp", "add", "--transport", arg.transport, arg.name, arg.url,
+	}
+	if arg.scope != "" {
+		scopeArg := []string{"--scope", arg.scope}
+		args = append(args, scopeArg...)
+	}
+	if len(arg.env) != 0 {
+		for _, e := range arg.env {
+			envArg := []string{"-e", e}
+			args = append(args, envArg...)
+		}
+	}
+	if len(arg.header) != 0 {
+		for _, h := range arg.header {
+			headerArg := []string{"-H", h}
+			args = append(args, headerArg...)
+		}
+	}
+	err := c.run(args...)
+
+	// Allow to add duplicate mcp server name (core will return error)
+	if err == nil || strings.Contains(err.Error(), "already exists") {
+		return nil
+	}
+	return err
+}

hgctl/pkg/agent/deploy.go

@@ -0,0 +1,406 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+
+	"github.com/alibaba/higress/hgctl/pkg/util"
+	"github.com/spf13/cobra"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+)
+
+type DeployType string
+
+const (
+	AgentRun DeployType = "agent-run"
+	Local    DeployType = "local"
+)
+
+var (
+	AddAccessKeyCmd   = fmt.Sprintf("s config add -a %s", DefaultServerLessAccessKey)
+	CheckAccessKeyCmd = fmt.Sprintf("s config get -a %s", DefaultServerLessAccessKey)
+	DeployAgentRunCmd = fmt.Sprintf("s deploy -a %s", DefaultServerLessAccessKey)
+)
+
+const (
+	InstallServerlessCmd = "npm install @serverless-devs/s -g"
+	BuildAgentCmd        = "s build"
+	ServerlessCliDocs    = "https://serverless-devs.com/docs/user-guide/install"
+)
+
+type DeployHandler struct {
+	Name     string
+	AgentDir string
+	Type     DeployType
+}
+
+func deployAgentCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "deploy [name]",
+		Short: "Deploy the specified agent locally or to the cloud",
+		Args:  cobra.ExactArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			handler := &DeployHandler{
+				Name: args[0],
+			}
+			cmdutil.CheckErr(handler.Deploy())
+		},
+	}
+
+	var cloud = false
+	cmd.PersistentFlags().BoolVar(&cloud, "agentrun", false, "deploy agent using agentrun")
+
+	return cmd
+}
+
+func (h *DeployHandler) validate() error {
+	if err := h.checkRequiredEnvironment(); err != nil {
+		return fmt.Errorf("failed to get required environment: %s", err)
+	}
+	return nil
+}
+
+func (h *DeployHandler) RunCmd(showOutput bool, cmd string, targetDir string) (string, error) {
+	runCmd := exec.Command("bash", "-c", cmd)
+
+	if targetDir != "" {
+		runCmd.Dir = targetDir
+	}
+
+	if showOutput {
+		runCmd.Stderr = os.Stderr
+		runCmd.Stdout = os.Stdout
+		if err := runCmd.Run(); err != nil {
+			return "", err
+		}
+
+		return "", nil
+	}
+	output, err := runCmd.CombinedOutput()
+	if err != nil {
+		return "", err
+	}
+	return string(output), nil
+}
+
+func (h *DeployHandler) RunPythonCmd(showOutput bool, args ...string) error {
+	cmd := exec.Command("python3", args...)
+
+	if showOutput {
+		cmd.Stderr = os.Stderr
+		cmd.Stdout = os.Stdout
+	}
+
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) checkAgentRunEnvironment() error {
+	if _, err := h.RunCmd(false, "s --version", ""); err != nil {
+		fmt.Println("Serverless dev cli not installed, install it automatically..")
+		if _, err := h.RunCmd(true, InstallServerlessCmd, ""); err != nil {
+			return fmt.Errorf("failed to install serverless dev cli automatically, details refers to %s", ServerlessCliDocs)
+		}
+	}
+
+	if _, err := h.RunCmd(false, "docker --version", ""); err != nil {
+		return fmt.Errorf("docker is required to deploy agent to agentRun: %s", err)
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) checkLocalEnvironment() error {
+	pyVenv, err := util.GetPythonVersion()
+	if err != nil {
+		fmt.Printf("Python environment not found, you need Python environment to run your agent\n")
+		return err
+	}
+
+	if util.CompareVersions(pyVenv, MinPythonVersion) == -1 {
+		fmt.Printf("Current Python: %s need Python %s+", MinPythonVersion, pyVenv)
+		return fmt.Errorf("unsupport python version")
+	}
+
+	missingDeps := []string{}
+	if err := h.RunPythonCmd(false, "-c", "import agentscope; print(agentscope.__version__)"); err != nil {
+		missingDeps = append(missingDeps, "agentscope")
+	}
+
+	if err := h.RunPythonCmd(false, "-c", "import agentscope_runtime; print(agentscope_runtime.__version__)"); err != nil {
+		missingDeps = append(missingDeps, "agentscope-runtime==1.0.0")
+	}
+
+	if len(missingDeps) != 0 {
+		venvDir := filepath.Join(util.GetHomeHgctlDir(), ".venv")
+		if _, err := os.Stat(venvDir); err == nil {
+			// check again
+			missingDeps := []string{}
+			if err := h.RunPythonCmd(false, "-c", "import agentscope; print(agentscope.__version__)"); err != nil {
+				fmt.Println("agentscope not installed, installing...")
+				missingDeps = append(missingDeps, "agentscope")
+			}
+			if err := h.RunPythonCmd(false, "-c", "import agentscope_runtime; print(agentscope_runtime.__version__)"); err != nil {
+				fmt.Println("agentscope-runtime not installed, installing...")
+				missingDeps = append(missingDeps, "agentscope-runtime==1.0.0")
+			}
+			// This means ~/.hgctl/.venv/ has already installed the deps before
+			if len(missingDeps) == 0 {
+				if err := h.activateLocalPythonVenv(); err != nil {
+					return err
+				}
+			}
+		}
+
+		if err := h.installLocalRequiredDeps(missingDeps); err != nil {
+			return fmt.Errorf("failed to install missing deps: %s", err)
+		}
+
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) createLocalPyVenv() error {
+	venvDir := filepath.Join(util.GetHomeHgctlDir(), ".venv")
+	cmd := exec.Command("python3", "-m", "venv", venvDir)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		fmt.Println("failed to create python virtual environment", string(output))
+		return err
+	}
+	return nil
+}
+
+func (h *DeployHandler) installLocalRequiredDeps(missingDeps []string) error {
+	if err := h.RunPythonCmd(true, "-m", "pip", "--version"); err != nil {
+		fmt.Printf("Pip not installed, you need install pip to deploy your agent\n")
+		return err
+	}
+
+	fmt.Println("This may takes a few minutes, you can install missing deps by yourself: ")
+	for _, deps := range missingDeps {
+		fmt.Println("- ", deps)
+	}
+
+	if err := h.createLocalPyVenv(); err != nil {
+		return fmt.Errorf("failed to create local venv (~/.hgctl/.venv): %s", err)
+	}
+
+	if err := h.activateLocalPythonVenv(); err != nil {
+		return fmt.Errorf("failed to activateLocalPythonVenv: %s", err)
+	}
+
+	for _, deps := range missingDeps {
+		if err := h.RunPythonCmd(true, "-m", "pip", "install", deps); err != nil {
+			fmt.Printf("failed to install missing deps: %s\n", deps)
+			return err
+		}
+	}
+
+	venvDir := filepath.Join(util.GetHomeHgctlDir(), ".venv")
+	fmt.Println("Missing deps installed successfully, target python venv path: ", venvDir)
+
+	return nil
+}
+
+func (h *DeployHandler) activateLocalPythonVenv() error {
+	venvDir := filepath.Join(util.GetHomeHgctlDir(), ".venv")
+	path := os.Getenv("PATH")
+	newPath := venvDir + "/bin:" + path
+	err := os.Setenv("PATH", newPath)
+	if err != nil {
+		fmt.Println("Failed to set PATH:", err)
+		return err
+	}
+	err = os.Setenv("VIRTUAL_ENV", venvDir)
+	if err != nil {
+		fmt.Println("Failed to set VIRTUAL_ENV:", err)
+		return err
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) checkRequiredEnvironment() error {
+	if h.Type == AgentRun {
+		return h.checkAgentRunEnvironment()
+	}
+
+	if h.Type == Local {
+		return h.checkLocalEnvironment()
+	}
+	return nil
+}
+
+func (h *DeployHandler) GetRequiredDeps() ([]string, error) {
+	switch h.Type {
+	case AgentRun:
+		return []string{
+			"agentrun-sdk[agentscope,server] >= 0.0.3",
+		}, nil
+	case Local:
+		return []string{
+			"agentscope", "agentscope-runtime==1.0.0",
+		}, nil
+	default:
+		return nil, fmt.Errorf("unsupported deploy target type: %s", h.Type)
+	}
+}
+
+// Quick and simple to get type by examine the existence of `requirements.txt` file
+func (h *DeployHandler) getAgentType() error {
+	path, err := util.GetSpecificAgentDir(h.Name)
+	if err != nil {
+		fmt.Printf("invalid agent: %s", err)
+		return err
+	}
+	h.AgentDir = path
+
+	filePath := filepath.Join(h.AgentDir, "requirements.txt")
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		h.Type = Local
+		return nil
+	}
+	h.Type = AgentRun
+	return nil
+}
+
+func (h *DeployHandler) Deploy() error {
+	if err := h.getAgentType(); err != nil {
+		return err
+	}
+
+	if err := h.validate(); err != nil {
+		return err
+	}
+
+	switch h.Type {
+	case AgentRun:
+		if err := h.HandleAgentRun(); err != nil {
+			return err
+		}
+
+	case Local:
+		if err := h.HandleLocal(); err != nil {
+			return err
+		}
+
+	default:
+		return fmt.Errorf("unsupported deploy target type: %s", h.Type)
+	}
+
+	if h.Type == AgentRun {
+		fmt.Printf("\n🌟 Agent deploy to agentRun successfully! Refers to https://functionai.console.aliyun.com/cn-hangzhou/agent/runtime to get it")
+		fmt.Printf("You can publish it to Higress and Himarket by using `hgctl agent add %s <endpoints-url> -t model --as-product `\n", h.Name)
+	}
+	return nil
+}
+
+// details see: https://github.com/Serverless-Devs/agentrun-sdk-python
+func (h *DeployHandler) HandleAgentRun() error {
+	if err := h.CheckServerlessAccessKey(); err != nil {
+		return fmt.Errorf("failed to set access key automatically: %s", err)
+	}
+
+	if _, err := h.RunCmd(true, BuildAgentCmd, h.AgentDir); err != nil {
+		return fmt.Errorf("failed to build agent: %s", err)
+	}
+
+	if _, err := h.RunCmd(true, DeployAgentRunCmd, h.AgentDir); err != nil {
+		return fmt.Errorf("failed to deploy agent: %s", err)
+	}
+
+	return nil
+}
+
+// Set Serverless's Access Key in s.yaml, details see: https://github.com/Serverless-Devs/agentrun-sdk-python
+// Example:
+// $ s config get -a defualt
+
+// You have not yet been found to have configured key information.
+// You can use [s config add] for key configuration, or use [s config add -h] to view configuration help.
+// If you already used [s config add], please check the permission of file [{HOMEPATH}/.s/access.yaml].
+// If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues
+//
+// s version: @serverless-devs/s: 3.1.10
+func (h *DeployHandler) CheckServerlessAccessKey() error {
+	notFoundMessage := "You have not yet been found to have configured key information"
+	output, err := h.RunCmd(false, CheckAccessKeyCmd, "")
+	if err != nil {
+		return fmt.Errorf("failed to run %s command to check access key: %s", CheckAccessKeyCmd, err)
+	}
+	if strings.Contains(output, notFoundMessage) {
+		fmt.Fprintf(os.Stderr, `
+🔑 **ACTION REQUIRED**: Please configure your Alibaba Cloud credentials first.
+Copy and run the command below to set up your Access Key:
+> %s
+
+`, AddAccessKeyCmd)
+		return fmt.Errorf("access key not found")
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) HandleLocal() error {
+	if _, err := os.Stat(h.AgentDir); os.IsNotExist(err) {
+		return fmt.Errorf("agent source file not found: %s", h.AgentDir)
+	}
+
+	if err := h.startAgentProcess(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (h *DeployHandler) startAgentProcess() error {
+	switch runtime.GOOS {
+	case "windows":
+		return h.runWindowsAgent()
+	case "darwin", "linux":
+		return h.runUnixAgent()
+	default:
+		return fmt.Errorf("unsupported operating system: %s", runtime.GOOS)
+	}
+}
+
+func (h *DeployHandler) runUnixAgent() error {
+	agentFile := filepath.Join(h.AgentDir, ASRuntimeMainPyFile)
+	if err := h.RunPythonCmd(true, agentFile); err != nil {
+		fmt.Println("failed to start agent, exiting...")
+		return err
+	}
+	return nil
+}
+
+func (h *DeployHandler) runWindowsAgent() error {
+	agentFile := filepath.Join(h.AgentDir, ASRuntimeMainPyFile)
+	if err := h.RunPythonCmd(true, agentFile); err != nil {
+		fmt.Println("failed to start agent, exiting...")
+		return err
+	}
+	return nil
+}

hgctl/pkg/agent/mcp.go

@@ -0,0 +1,343 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"fmt"
+	"io"
+	"net/url"
+	"os"
+
+	"github.com/alibaba/higress/hgctl/pkg/agent/services"
+	"github.com/alibaba/higress/hgctl/pkg/helm"
+	"github.com/fatih/color"
+	"github.com/higress-group/openapi-to-mcpserver/pkg/models"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+)
+
+type MCPType string
+
+const (
+	OPENAPI string = "openapi"
+	HTTP    string = "http"
+
+	STREAMABLE string = "streamable"
+	SSE        string = "sse"
+
+	DIRECT_ROUTE string = "DIRECT_ROUTE"
+	OPEN_API     string = "OPEN_API"
+)
+
+type MCPAddArg struct {
+	HigressConsoleAuthArg
+	HimarketAdminAuthArg
+
+	name      string
+	url       string
+	typ       string
+	transport string
+	spec      string
+	scope     string
+	env       []string
+	header    []string
+	noPublish bool
+	asProduct bool
+}
+
+type MCPAddHandler struct {
+	core *AgenticCore
+	arg  MCPAddArg
+	w    io.Writer
+}
+
+func NewMCPCmd() *cobra.Command {
+	mcpCmd := &cobra.Command{
+		Use:   "mcp",
+		Short: "for the mcp management",
+	}
+
+	mcpCmd.AddCommand(newMCPAddCmd())
+
+	return mcpCmd
+}
+
+func newMCPAddCmd() *cobra.Command {
+	// parameter
+	arg := &MCPAddArg{}
+
+	cmd := &cobra.Command{
+		Use:   "add [name] [url]",
+		Short: "add mcp server including http and openapi",
+		Example: `  # Add HTTP type MCP Server
+  hgctl mcp add http-mcp http://localhost:8080/mcp
+
+  # Add MCP Server with environment variables and headers
+  hgctl mcp add http-mcp http://localhost:8080/mcp -e API_KEY=secret -H "Authorization: Bearer token"
+
+  # Add MCP Server use Openapi file
+  hgctl mcp add swagger-mcp ./path/to/openapi.yaml --type openapi`,
+		Run: func(cmd *cobra.Command, args []string) {
+
+			arg.name = args[0]
+			if arg.typ == HTTP {
+				arg.url = args[1]
+			} else {
+				arg.spec = args[1]
+			}
+
+			resolveHigressConsoleAuth(&arg.HigressConsoleAuthArg)
+			resolveHimarketAdminAuth(&arg.HimarketAdminAuthArg)
+			cmdutil.CheckErr(handleAddMCP(cmd.OutOrStdout(), *arg))
+			color.Cyan("Tip: Try doing 'kubectl port-forward' and add the server to the agent manually, if using Higress MCP Server and connection failed")
+		},
+		Args: cobra.ExactArgs(2),
+	}
+
+	cmd.PersistentFlags().StringVar(&arg.typ, "type", HTTP, "Determine the MCP Server's Type")
+	cmd.PersistentFlags().StringVarP(&arg.transport, "transport", "t", STREAMABLE, `The MCP Server's transport`)
+	cmd.PersistentFlags().StringVarP(&arg.scope, "scope", "s", "project", `Configuration scope (project or global)`)
+	cmd.PersistentFlags().StringSliceVarP(&arg.env, "env", "e", nil, "Environment variables to pass to the MCP server (can be specified multiple times)")
+	cmd.PersistentFlags().StringSliceVarP(&arg.header, "header", "H", nil, "HTTP headers to pass to the MCP server (can be specified multiple times)")
+	cmd.PersistentFlags().BoolVar(&arg.noPublish, "no-publish", false, "If set then the mcp server will not be plubished to higress")
+	cmd.PersistentFlags().BoolVar(&arg.asProduct, "as-product", false, "If it's set then the agent API will be published to Himarket (no-publish must be false)")
+
+	// cmd.PersistentFlags().StringVar(&arg.spec, "spec", "", "Specification file (yaml/json) of the openapi api")
+
+	addHigressConsoleAuthFlag(cmd, &arg.HigressConsoleAuthArg)
+	addHimarketAdminAuthFlag(cmd, &arg.HimarketAdminAuthArg)
+
+	return cmd
+}
+
+func newHanlder(c *AgenticCore, arg MCPAddArg, w io.Writer) *MCPAddHandler {
+	return &MCPAddHandler{c, arg, w}
+}
+
+func (h *MCPAddHandler) validateArg() error {
+	if !h.arg.noPublish {
+		return h.arg.HigressConsoleAuthArg.validate()
+	}
+	return nil
+
+}
+
+func (h *MCPAddHandler) addHTTPMCP() error {
+	if err := h.core.AddMCPServer(h.arg); err != nil {
+		return fmt.Errorf("mcp add failed: %w", err)
+	}
+
+	if !h.arg.noPublish {
+		return publishMCPToHigress(h.arg, h.arg.typ, nil)
+	}
+	return nil
+
+}
+
+// hgctl mcp add -t openapi --name test-name --spec openapi.json
+func (h *MCPAddHandler) addOpenAPIMCP() error {
+	// fmt.Printf("get mcp server: %s openapi-spec-file: %s\n", h.arg.name, h.arg.spec)
+	config := h.parseOpenapiSpec()
+	config.Server.SecuritySchemes[0].DefaultCredential = "b5b9752c7ad2cb9c6b19fb5fd6a23be8852eca9c"
+	// fmt.Printf("get config struct: %v", config)
+
+	// publish to higress
+	if err := publishMCPToHigress(h.arg, "streamable", config); err != nil {
+		return err
+	}
+
+	// add mcp server to agent
+	gatewayURL := viper.GetString(HIGRESS_GATEWAY_URL)
+	if gatewayURL == "" {
+		svcIP, err := GetHigressGatewayServiceIP()
+		if err != nil {
+			color.Red(
+				"failed to add mcp server [%s] while getting higress-gateway ip due to: %v \n You may try to do port-forward and add it to agent manually", h.arg.name, err)
+			return err
+		}
+		gatewayURL = svcIP
+	}
+
+	mcpURL := fmt.Sprintf("%s/mcp-servers/%s", gatewayURL, h.arg.name)
+	h.arg.url = mcpURL
+	return h.core.AddMCPServer(h.arg)
+}
+
+func (h *MCPAddHandler) parseOpenapiSpec() *models.MCPConfig {
+	return parseOpenapi2MCP(h.arg)
+}
+
+func handleAddMCP(w io.Writer, arg MCPAddArg) error {
+	client, err := getCore()
+	if err != nil {
+		return fmt.Errorf("failed to get agent core: %s", err)
+	}
+	h := newHanlder(client, arg, w)
+	if err := h.validateArg(); err != nil {
+		return err
+	}
+
+	// spec -> OPENAPI
+	// noPublish -> typ
+	switch arg.typ {
+	case HTTP:
+		if err := h.addHTTPMCP(); err != nil {
+			return err
+		}
+
+	case OPENAPI:
+		if arg.spec == "" {
+			return fmt.Errorf("--spec is required for openapi type")
+		}
+		if arg.noPublish {
+			return fmt.Errorf("--no-publish is not supported for openapi type")
+		}
+		if arg.url != "" {
+			return fmt.Errorf("--url is not supported for openapi type")
+		}
+		if err := h.addOpenAPIMCP(); err != nil {
+			return err
+		}
+
+	}
+
+	if !arg.noPublish && arg.asProduct {
+		if err := publishAPIToHimarket("mcp", arg.name, arg.HimarketAdminAuthArg); err != nil {
+			fmt.Println("failed to publish it to himarket, please do it mannually")
+			return err
+		}
+	}
+
+	return nil
+
+}
+
+func publishMCPToHigress(arg MCPAddArg, transport string, config *models.MCPConfig) error {
+	// 1. parse the raw http url
+	// 2. add service source
+	// 3. add MCP server request
+	client := services.NewHigressClient(arg.hgURL, arg.hgUser, arg.hgPassword)
+
+	rawURL := arg.url
+	// DIRECT_ROUTE or OPEN_API
+	mcpType := DIRECT_ROUTE
+
+	if config != nil {
+		// TODO: here use tools's url directly, need to be considered
+		rawURL = config.Tools[0].RequestTemplate.URL
+		mcpType = OPEN_API
+	}
+
+	srvName := fmt.Sprintf("hgctl-%s", arg.name)
+
+	// e.g. hgctl-mcp-deepwiki.dns
+	body, targetSrvName, port, err := services.BuildServiceBodyAndSrv(srvName, rawURL)
+	if err != nil {
+		return fmt.Errorf("invalid url format: %s", err)
+	}
+
+	resp, err := services.HandleAddServiceSource(client, body)
+	if err != nil {
+		return fmt.Errorf("response body: %s %s\n", string(resp), err)
+	}
+
+	srvField := []map[string]interface{}{{
+		"name":    targetSrvName,
+		"port":    port,
+		"version": "1.0",
+		"weight":  100,
+	}}
+
+	body = map[string]interface{}{
+		"name":        arg.name,
+		"description": "A MCP Server added by hgctl",
+		"type":        mcpType,
+		"services":    srvField,
+		"domains":     []interface{}{},
+		"consumerAuthInfo": map[string]interface{}{
+			"type":             "key-auth",
+			"allowedConsumers": []string{},
+		},
+	}
+
+	// Only DIRECT_ROUTE Type get below extra params
+	if mcpType == DIRECT_ROUTE {
+		res, _ := url.Parse(rawURL)
+		body["directRouteConfig"] = map[string]interface{}{
+			"path":          res.Path,
+			"transportType": arg.transport,
+		}
+	}
+
+	_, err = services.HandleAddMCPServer(client, body)
+	if err != nil {
+		return err
+	}
+
+	if mcpType == OPEN_API {
+		addMCPToolConfig(client, config, srvField)
+	}
+
+	return nil
+}
+
+func addMCPToolConfig(client *services.HigressClient, config *models.MCPConfig, srvField []map[string]interface{}) {
+	body := map[string]interface{}{
+		"name":              config.Server.Name,
+		"description":       "A MCP Server added by hgctl",
+		"services":          srvField,
+		"type":              OPEN_API,
+		"rawConfigurations": convertMCPConfigToStr(config),
+		"mcpServerName":     config.Server.Name,
+		"domains":           []interface{}{},
+		"consumerAuthInfo": map[string]interface{}{
+			"type":             "key-auth",
+			"allowedConsumers": []string{},
+		},
+	}
+
+	_, err := services.HandleAddOpenAPITool(client, body)
+	if err != nil {
+		fmt.Printf("add openapi tools failed: %v\n", err)
+		os.Exit(1)
+	}
+	// fmt.Println("get openapi tools add response: ", string(resp))
+}
+
+func tryToGetLocalCredential(arg *HigressConsoleAuthArg) error {
+	profileContexts, err := getAllProfiles()
+
+	// The higress is not installed by hgctl
+	if err != nil || len(profileContexts) == 0 {
+		return err
+	}
+
+	for _, ctx := range profileContexts {
+		installTyp := ctx.Install
+		if installTyp == helm.InstallK8s || installTyp == helm.InstallLocalK8s {
+			user, pwd, err := getConsoleCredentials(ctx.Profile)
+			if err != nil {
+				continue
+			}
+			// TODO: always use the first one profile
+			arg.hgUser = user
+			arg.hgPassword = pwd
+			return nil
+		}
+	}
+
+	return nil
+}

hgctl/pkg/agent/new.go

@@ -0,0 +1,341 @@
+// Copyright (c) 2025 Alibaba Group Holding Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+	"fmt"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"text/template"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/alibaba/higress/hgctl/pkg/agent/prompt"
+	"github.com/alibaba/higress/hgctl/pkg/manifests"
+	"github.com/alibaba/higress/hgctl/pkg/util"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+const (
+	ASRuntimeMainPyFile = "as_runtime_main.py"
+	AgentRunMainPyFile  = "agentrun_main.py"
+	ToolKitPyFile       = "toolkit.py"
+	AgentClassFile      = "agent.py"
+	CorePromptFile      = "claude.md" // TODO: support qoder AGENTS.md
+	SConfigYAML         = "s.yaml"
+
+	ARTemplate         = "agentrun.tmpl"
+	ASTemplate         = "agentscope.tmpl"
+	AgentClassTemplate = "agent.tmpl"
+	ToolKitTemplate    = "toolkit.tmpl"
+	SConfigTemplate    = "agentrun_s.tmpl"
+)
+
+var ASAvailiableTools = []string{
+	"execute_python_code",
+	"execute_shell_command",
+	"view_text_file",
+	"write_text_file",
+	"insert_text_file",
+	"dashscope_text_to_image",
+	"dashscope_text_to_audio",
+	"dashscope_image_to_text",
+	"openai_text_to_image",
+	"openai_text_to_audio",
+	"openai_edit_image",
+	"openai_create_image_variation",
+	"openai_image_to_text",
+	"openai_audio_to_text",
+}
+
+const (
+	MinPythonVersion = "3.12"
+
+	DefaultServerLessAccessKey = "hgctl-credential"
+)
+
+// Callback type for post-agent-creation actions
+type PostAgentAction func(config *AgentConfig) error
+
+type MCPServerConfig struct {
+	Name      string            // MCP Client Name
+	URL       string            // MCP Server URL
+	Transport string            // transport `streamable_http` or `see` or `stdio`
+	Headers   map[string]string // HTTP Headers
+}
+
+type ServerlessConfig struct {
+	AccessKey    string
+	ResourceName string
+	Region       string
+	AgentName    string
+	AgentDesc    string
+	Port         uint
+
+	DiskSize uint
+	Timeout  uint
+
+	GlobalConfig HgctlAgentConfig
+}
+
+type AgentConfig struct {
+	AppName         string   //  "app"
+	AppDescription  string   //  "A helpful assistant and useful agent"
+	AgentName       string   //  "Friday"
+	AvailableTools  []string //   availiable tools (built-in agentscope)
+	SysPromptPath   string   //  "You are a helpful assistant"
+	ChatModel       string   //  "qwen-max"
+	Provider        string   //  "Aliyun"
+	APIKeyEnvVar    string   //  DASHCOPE_API_KEY
+	DeploymentPort  int      //  8090
+	HostBinding     string   //  0.0.0.0
+	EnableStreaming bool     //  true
+	EnableThinking  bool     //  true
+	MCPServers      []MCPServerConfig
+
+	Type          DeployType
+	ServerlessCfg ServerlessConfig
+}
+
+func createAgentCmd() *cobra.Command {
+	agentRun := false
+	deployDirect := false
+
+	var createAgentCmd = &cobra.Command{
+		Use:   "new",
+		Short: "Create a new agent or import one from core",
+		Args:  cobra.ExactArgs(0),
+		Run: func(cmd *cobra.Command, args []string) {
+			config := &AgentConfig{
+				Type: Local,
+			}
+			if agentRun {
+				config.Type = AgentRun
+				config.ServerlessCfg = ServerlessConfig{
+					AccessKey: DefaultServerLessAccessKey,
+					Port:      9000,
+					DiskSize:  512,
+					Timeout:   600,
+
+					GlobalConfig: GlobalConfig,
+				}
+			}
+
+			if err := getAgentConfig(config); err != nil {
+				fmt.Printf("Error get Agent config: %v\n", err)
+				os.Exit(1)
+			}
+
+			if err := createAgentTemplate(config); err != nil {
+				fmt.Printf("Error creating agent: %v\n", err)
+				os.Exit(1)
+			}
+
+			if err := afterCreatedAgent(config); err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+		},
+	}
+
+	createAgentCmd.PersistentFlags().BoolVar(&agentRun, "agent-run", false, "Use agentRun to deploy to Alibaba cloud, default is false")
+	createAgentCmd.PersistentFlags().BoolVar(&deployDirect, "deploy", false, "After agent creation, deploy it directly")
+	return createAgentCmd
+
+}
+
+func afterCreatedAgent(config *AgentConfig) error {
+	options := []string{
+		"Deploy it directly",
+		fmt.Sprintf("Improve and test it using agentic core (%s)", viper.GetString(HGCTL_AGENT_CORE)),
+		"Do nothing and quit",
+	}
+	callbacks := map[string]PostAgentAction{
+		options[0]: func(cfg *AgentConfig) error {
+			handler := &DeployHandler{Name: cfg.AgentName}
+			return handler.Deploy()
+		},
+		options[1]: func(cfg *AgentConfig) error {
+			return runAgenticCoreImprovement(cfg)
+		},
+	}
+
+	if err := promptAfterCreatedAgent(options, config, callbacks); err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to handle post-creation action: %v\n", err)
+		return nil
+	}
+	return nil
+}
+
+func runAgenticCoreImprovement(cfg *AgentConfig) error {
+	core, err := getCore()
+	if err != nil {
+		return fmt.Errorf("failed to invoke agent core: %s", err)
+	}
+
+	if err := core.ImproveNewAgent(cfg); err != nil {
+		return fmt.Errorf("failed to use core to improve new agent: %s", err)
+	}
+	return nil
+}
+
+func promptAfterCreatedAgent(options []string, config *AgentConfig, callbacks map[string]PostAgentAction) error {
+
+	promptChoice := &survey.Select{
+		Message: "What's next?:",
+		Options: options,
+		Help:    "Choose an action to perform after agent creation.",
+	}
+
+	var response string
+	if err := survey.AskOne(promptChoice, &response); err != nil {
+		return fmt.Errorf("failed to read user choice: %w", err)
+	}
+
+	if callback, ok := callbacks[response]; ok {
+		return callback(config)
+	}
+
+	if response == options[2] {
+		os.Exit(1)
+	}
+
+	return fmt.Errorf("unknown action selected: %q", response)
+}
+
+func createAgentTemplate(config *AgentConfig) error {
+	agentsDir := util.GetHomeHgctlDir() + "/agents"
+	if err := os.MkdirAll(agentsDir, 0755); err != nil {
+		return fmt.Errorf("failed to create agents directory: %v", err)
+	}
+
+	agentDir := filepath.Join(agentsDir, config.AgentName)
+	if err := os.MkdirAll(agentDir, 0755); err != nil {
+		return fmt.Errorf("failed to create agent directory: %v", err)
+	}
+
+	switch config.Type {
+	case Local:
+		// parse agentscope file
+		asMain := filepath.Join(agentDir, ASRuntimeMainPyFile)
+		asTemplateStr, err := get_template(ASTemplate)
+		if err != nil {
+			return fmt.Errorf("failed to read agentscope template: %v", err)
+		}
+		if err := renderTemplateFile(asTemplateStr, asMain, config); err != nil {
+			return fmt.Errorf("failed to render agentscope runtime's file: %s", err)
+		}
+	case AgentRun:
+		// Details see: https://github.com/Serverless-Devs/agentrun-sdk-python
+
+		// parse agentrun file
+		arMain := filepath.Join(agentDir, AgentRunMainPyFile)
+		arTemplateStr, err := get_template(ARTemplate)
+		if err != nil {
+			return fmt.Errorf("failed to read agentrun template: %v", err)
+		}
+		if err := renderTemplateFile(arTemplateStr, arMain, config); err != nil {
+			return fmt.Errorf("failed to render agentscope runtime's file: %s", err)
+		}
+
+		// parse s.yaml
+		s := filepath.Join(agentDir, SConfigYAML)
+		STmplStr, err := get_template(SConfigTemplate)
+		if err != nil {
+			return fmt.Errorf("failed to read agentrun's serverless config file template: %v", err)
+		}
+		if err := renderTemplateFile(STmplStr, s, config.ServerlessCfg); err != nil {
+			return fmt.Errorf("failed to render agentscope runtime's file: %s", err)
+		}
+
+		// write requirements
+		fileContent := "agentrun-sdk[agentscope,server]>=0.0.3"
+		targetFilePath := filepath.Join(agentDir, "requirements.txt")
+		if err := util.WriteFileString(targetFilePath, fileContent, os.ModePerm); err != nil {
+			return fmt.Errorf("failed to write requirements.txt file to target agent directory: %s", err)
+		}
+	}
+
+	// parse toolkitPath
+	toolkitPath := filepath.Join(agentDir, ToolKitPyFile)
+	toolkitTmpl, err := get_template(ToolKitTemplate)
+	if err != nil {
+		return fmt.Errorf("failed to read toolkit template: %v", err)
+	}
+	if err := renderTemplateFile(toolkitTmpl, toolkitPath, config); err != nil {
+		return fmt.Errorf("failed to render toolkit file: %s", err)
+	}
+
+	// write agent.py
+	agentPath := filepath.Join(agentDir, AgentClassFile)
+	agentTmpl, err := get_template(AgentClassTemplate)
+	if err != nil {
+		return fmt.Errorf("failed to read agent class template: %v", err)
+	}
+	if err := renderTemplateFile(agentTmpl, agentPath, config); err != nil {
+		return fmt.Errorf("failed to render agent class file: %s", err)
+	}
+
+	// write core_prompt.md
+	if core, err := getCore(); err == nil {
+		corePromptPath := filepath.Join(agentDir, core.GetPromptFileName())
+		if err := util.WriteFileString(corePromptPath, prompt.AgentDevelopmentGuide, os.ModePerm); err != nil {
+			return fmt.Errorf("failed to write %s file to target agent directory: %s", core.GetPromptFileName(), err)
+		}
+		return nil
+	} else {
+		return fmt.Errorf("failed to add instruction file in agent dir: %s", err)
+	}
+}
+
+func renderTemplateFile(templateStr string, targetPath string, data interface{}) error {
+	// sync with python
+	funcMap := template.FuncMap{
+		"boolToPython": func(b bool) string {
+			if b {
+				return "True"
+			}
+			return "False"
+		},
+	}
+
+	tmpl, err := template.New("agent").Funcs(funcMap).Parse(templateStr)
+	if err != nil {
+		return fmt.Errorf("failed to parse template: %v", err)
+	}
+	file, err := os.Create(targetPath)
+	if err != nil {
+		return fmt.Errorf("failed to create output file: %v", err)
+	}
+	defer file.Close()
+
+	if err := tmpl.Execute(file, data); err != nil {
+		return fmt.Errorf("failed to render template: %v", err)
+	}
+
+	return nil
+}
+
+func get_template(templatePath string) (string, error) {
+	f := manifests.BuiltinOrDir("")
+	templatePath = "agent/template/" + templatePath
+	data, err := fs.ReadFile(f, templatePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to read template: %w", err)
+	}
+
+	return string(data), nil
+}