From 10b1e8328eb0bf0c50b05714e3184f2aa6809fcc Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:11:52 +0800
Subject: [PATCH 1/8] feat: add system plugin runtime variants

---
 AGENTS.md                                     |   2 +
 backend/app/api/endpoints/admin/plugins.py    | 132 +++
 backend/app/api/endpoints/admin/router.py     |   2 +
 .../app/api/endpoints/installed_plugins.py    |  52 ++
 backend/app/schemas/installed_plugin.py       |  58 +-
 .../device/capability_sync_service.py         |   1 +
 .../app/services/installed_plugin_service.py  | 610 +++++++++++++-
 .../tests/api/endpoints/test_plugins_api.py   | 175 ++++
 .../device/test_capability_sync_service.py    |   2 +
 .../services/test_installed_plugin_upload.py  | 136 ++-
 .../system-plugin-management.md               |  73 ++
 .../system-plugin-management.md               |  73 ++
 executor/modes/local/capabilities.py          |  96 ++-
 .../test_local_capability_sync_handler.py     |  99 +++
 .../components/SystemPluginList.test.tsx      | 199 +++++
 frontend/src/apis/admin.ts                    | 155 ++++
 frontend/src/app/admin/page.tsx               |   6 +
 .../features/admin/components/AdminTabNav.tsx |   3 +
 .../admin/components/SystemPluginList.tsx     | 591 +++++++++++++
 frontend/src/i18n/locales/en/admin.json       |  62 ++
 frontend/src/i18n/locales/zh-CN/admin.json    |  62 ++
 wework/src/api/adapters.test.ts               |  14 -
 wework/src/api/plugins.ts                     |  18 +-
 .../components/plugins/PluginCreateMenu.tsx   |  17 +-
 .../PluginManagementWorkspace.test.tsx        |  64 ++
 .../plugins/PluginManagementWorkspace.tsx     | 338 +++-----
 .../plugins/PluginUploadDialog.test.tsx       |  44 -
 .../components/plugins/PluginUploadDialog.tsx | 138 ----
 .../plugins/PluginsWorkspace.test.tsx         | 334 +++++---
 .../components/plugins/PluginsWorkspace.tsx   | 779 +++++++++---------
 wework/src/i18n/locales/en/common.json        |  11 +-
 wework/src/i18n/locales/zh-CN/common.json     |  11 +-
 wework/src/types/api.ts                       |  28 +-
 33 files changed, 3343 insertions(+), 1042 deletions(-)
 create mode 100644 backend/app/api/endpoints/admin/plugins.py
 create mode 100644 backend/tests/api/endpoints/test_plugins_api.py
 create mode 100644 docs/en/developer-guide/system-plugin-management.md
 create mode 100644 docs/zh/developer-guide/system-plugin-management.md
 create mode 100644 frontend/src/__tests__/features/admin/components/SystemPluginList.test.tsx
 create mode 100644 frontend/src/features/admin/components/SystemPluginList.tsx
 create mode 100644 wework/src/components/plugins/PluginManagementWorkspace.test.tsx
 delete mode 100644 wework/src/components/plugins/PluginUploadDialog.test.tsx
 delete mode 100644 wework/src/components/plugins/PluginUploadDialog.tsx

diff --git a/AGENTS.md b/AGENTS.md
index a0e0455a41..c94b7750f2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -45,6 +45,8 @@ Wegent is an open-source AI-native operating system for defining, organizing, an
 - English version: [`docs/en/developer-guide/shared-skill-directory.md`](docs/en/developer-guide/shared-skill-directory.md)
 - Runtime local work (Project -> Device Workspace -> LocalTask without DB task rows): [`docs/zh/developer-guide/runtime-local-work.md`](docs/zh/developer-guide/runtime-local-work.md)
 - English version: [`docs/en/developer-guide/runtime-local-work.md`](docs/en/developer-guide/runtime-local-work.md)
+- System plugin management (admin-managed plugin catalog and Wework manual updates): [`docs/zh/developer-guide/system-plugin-management.md`](docs/zh/developer-guide/system-plugin-management.md)
+- English version: [`docs/en/developer-guide/system-plugin-management.md`](docs/en/developer-guide/system-plugin-management.md)
 
 **📚 Documentation Writing Rules:**
 - All documentation files MUST include frontmatter with `sidebar_position` for ordering:
diff --git a/backend/app/api/endpoints/admin/plugins.py b/backend/app/api/endpoints/admin/plugins.py
new file mode 100644
index 0000000000..dbc6c4693d
--- /dev/null
+++ b/backend/app/api/endpoints/admin/plugins.py
@@ -0,0 +1,132 @@
+# SPDX-FileCopyrightText: 2026 Weibo, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import logging
+
+from fastapi import APIRouter, Depends, File, Form, UploadFile, status
+from sqlalchemy.orm import Session
+
+from app.api.dependencies import get_db
+from app.core.security import get_admin_user
+from app.models.user import User
+from app.schemas.installed_plugin import (
+    PluginRuntime,
+    SystemPlugin,
+    SystemPluginListResponse,
+    SystemPluginUpdateRequest,
+)
+from app.services.claude_plugin_parser import MAX_PLUGIN_PACKAGE_SIZE_BYTES
+from app.services.installed_plugin_service import installed_plugin_service
+
+router = APIRouter()
+logger = logging.getLogger(__name__)
+PLUGIN_UPLOAD_CHUNK_SIZE_BYTES = 1024 * 1024
+
+
+@router.get("/plugins", response_model=SystemPluginListResponse)
+async def list_system_plugins(
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_admin_user),
+) -> SystemPluginListResponse:
+    """List system-managed Claude Code plugins."""
+    return installed_plugin_service.list_system_plugins(db=db)
+
+
+@router.post(
+    "/plugins",
+    response_model=SystemPlugin,
+    status_code=status.HTTP_201_CREATED,
+)
+async def upload_system_plugin(
+    file: UploadFile = File(...),
+    enabled: bool = Form(True),
+    runtime: PluginRuntime = Form("claudecode"),
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_admin_user),
+) -> SystemPlugin:
+    """Upload or replace a system-managed Claude Code plugin package."""
+    logger.info(
+        "System plugin upload requested: admin_id=%s filename=%s enabled=%s runtime=%s",
+        current_user.id,
+        file.filename,
+        enabled,
+        runtime,
+    )
+    package_bytes = await _read_plugin_upload(file)
+    return installed_plugin_service.upload_system_plugin(
+        db=db,
+        package_bytes=package_bytes,
+        filename=file.filename or "plugin.zip",
+        enabled=enabled,
+        runtime=runtime,
+    )
+
+
+@router.put("/plugins/{system_plugin_id}", response_model=SystemPlugin)
+async def update_system_plugin(
+    system_plugin_id: int,
+    request: SystemPluginUpdateRequest,
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_admin_user),
+) -> SystemPlugin:
+    """Update system plugin display metadata and visibility."""
+    return installed_plugin_service.update_system_plugin_metadata(
+        db=db,
+        system_plugin_id=system_plugin_id,
+        display_name=request.displayName,
+        description=request.description,
+        enabled=request.enabled,
+    )
+
+
+@router.put("/plugins/{system_plugin_id}/package", response_model=SystemPlugin)
+async def replace_system_plugin_package(
+    system_plugin_id: int,
+    file: UploadFile = File(...),
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_admin_user),
+) -> SystemPlugin:
+    """Replace a system plugin ZIP package with a new version."""
+    logger.info(
+        "System plugin package replacement requested: admin_id=%s plugin_id=%s filename=%s",
+        current_user.id,
+        system_plugin_id,
+        file.filename,
+    )
+    package_bytes = await _read_plugin_upload(file)
+    return installed_plugin_service.replace_system_plugin_package(
+        db=db,
+        system_plugin_id=system_plugin_id,
+        package_bytes=package_bytes,
+        filename=file.filename or "plugin.zip",
+    )
+
+
+@router.delete("/plugins/{system_plugin_id}", status_code=status.HTTP_204_NO_CONTENT)
+async def delete_system_plugin(
+    system_plugin_id: int,
+    db: Session = Depends(get_db),
+    current_user: User = Depends(get_admin_user),
+) -> None:
+    """Remove a system-managed plugin from the user-facing catalog."""
+    installed_plugin_service.delete_system_plugin(
+        db=db,
+        system_plugin_id=system_plugin_id,
+    )
+
+
+async def _read_plugin_upload(file: UploadFile) -> bytes:
+    chunks: list[bytes] = []
+    total_size = 0
+    while True:
+        chunk = await file.read(PLUGIN_UPLOAD_CHUNK_SIZE_BYTES)
+        if not chunk:
+            break
+        total_size += len(chunk)
+        if total_size > MAX_PLUGIN_PACKAGE_SIZE_BYTES:
+            from fastapi import HTTPException
+
+            raise HTTPException(status_code=413, detail="Plugin package is too large")
+        chunks.append(chunk)
+    return b"".join(chunks)
diff --git a/backend/app/api/endpoints/admin/router.py b/backend/app/api/endpoints/admin/router.py
index 45383deaaf..1e3780a4a0 100644
--- a/backend/app/api/endpoints/admin/router.py
+++ b/backend/app/api/endpoints/admin/router.py
@@ -11,6 +11,7 @@
     device_monitor,
     im_channels,
     kind_management,
+    plugins,
     public_bots,
     public_ghosts,
     public_models,
@@ -48,3 +49,4 @@
 router.include_router(device_monitor.router, tags=["admin-device-monitor"])
 router.include_router(templates.router, tags=["admin-templates"])
 router.include_router(runtime_cleanup.router, tags=["admin-runtime-cleanup"])
+router.include_router(plugins.router, tags=["admin-plugins"])
diff --git a/backend/app/api/endpoints/installed_plugins.py b/backend/app/api/endpoints/installed_plugins.py
index a3bd5868b2..e36bae290c 100644
--- a/backend/app/api/endpoints/installed_plugins.py
+++ b/backend/app/api/endpoints/installed_plugins.py
@@ -17,6 +17,7 @@
     InstalledPlugin,
     InstalledPluginListResponse,
     InstalledPluginUpdateRequest,
+    PluginCatalogListResponse,
 )
 from app.services.claude_plugin_parser import MAX_PLUGIN_PACKAGE_SIZE_BYTES
 from app.services.device.capability_sync_service import device_capability_sync_service
@@ -39,6 +40,57 @@ def list_installed_plugins(
     )
 
 
+@router.get("/catalog", response_model=PluginCatalogListResponse)
+def list_system_plugin_catalog(
+    db: Session = Depends(get_db),
+    current_user: User = Depends(security.get_current_user),
+) -> PluginCatalogListResponse:
+    """List system-managed plugins available to the current user."""
+    return installed_plugin_service.list_system_plugin_catalog(
+        db=db,
+        user_id=current_user.id,
+    )
+
+
+@router.post(
+    "/catalog/{system_plugin_id}/install",
+    response_model=InstalledPluginListResponse,
+    status_code=status.HTTP_201_CREATED,
+)
+async def install_system_plugin(
+    system_plugin_id: int,
+    db: Session = Depends(get_db),
+    current_user: User = Depends(security.get_current_user),
+) -> InstalledPluginListResponse:
+    """Install a system-managed plugin into the current user's inventory."""
+    installed = installed_plugin_service.install_system_plugin(
+        db=db,
+        user_id=current_user.id,
+        system_plugin_id=system_plugin_id,
+    )
+    await _sync_global_capabilities(db, current_user.id)
+    return installed
+
+
+@router.post(
+    "/catalog/{system_plugin_id}/update",
+    response_model=InstalledPluginListResponse,
+)
+async def update_system_plugin_installation(
+    system_plugin_id: int,
+    db: Session = Depends(get_db),
+    current_user: User = Depends(security.get_current_user),
+) -> InstalledPluginListResponse:
+    """Manually update the current user's installation from the system catalog."""
+    installed = installed_plugin_service.update_installed_plugin_from_system(
+        db=db,
+        user_id=current_user.id,
+        system_plugin_id=system_plugin_id,
+    )
+    await _sync_global_capabilities(db, current_user.id)
+    return installed
+
+
 @router.post(
     "/upload",
     response_model=InstalledPlugin,
diff --git a/backend/app/schemas/installed_plugin.py b/backend/app/schemas/installed_plugin.py
index 76dc81cca4..ebac36bb5f 100644
--- a/backend/app/schemas/installed_plugin.py
+++ b/backend/app/schemas/installed_plugin.py
@@ -15,6 +15,8 @@
     "uninstalled",
 ]
 
+PluginRuntime = Literal["claudecode", "codex"]
+
 
 class PluginSkillComponent(BaseModel):
     """Skill metadata discovered inside a Claude Code plugin."""
@@ -55,11 +57,12 @@ class InstalledPluginComponents(BaseModel):
 class InstalledPluginSource(BaseModel):
     """Source identity for a user-installed Claude Code plugin."""
 
-    type: Literal["upload", "marketplace", "local"] = "upload"
+    type: Literal["upload", "marketplace", "local", "system"] = "upload"
     providerKey: str = "claude-code"
     pluginKey: str
     catalogItemId: Optional[str] = None
     marketplace: Optional[str] = None
+    systemPluginId: Optional[int] = None
 
 
 class InstalledPluginPackageRef(BaseModel):
@@ -74,6 +77,7 @@ class InstalledPluginSpec(BaseModel):
     """User-scoped Claude Code plugin installation state."""
 
     source: InstalledPluginSource
+    runtime: PluginRuntime = "claudecode"
     displayName: str
     description: str = ""
     version: Optional[str] = None
@@ -111,6 +115,50 @@ class InstalledPluginListResponse(BaseModel):
     items: List[InstalledPlugin]
 
 
+class SystemPlugin(BaseModel):
+    """System-managed Claude Code plugin catalog item."""
+
+    apiVersion: str = "agent.wecode.io/v1"
+    kind: Literal["Plugin"] = "Plugin"
+    metadata: Dict[str, Any]
+    spec: InstalledPluginSpec
+    status: InstalledPluginStatus = Field(default_factory=InstalledPluginStatus)
+
+
+class SystemPluginListResponse(BaseModel):
+    """Response for admin system plugin management."""
+
+    total: int
+    items: List[SystemPlugin]
+
+
+class PluginCatalogItem(BaseModel):
+    """User-facing system plugin catalog item with install state."""
+
+    id: int
+    name: str
+    displayName: str
+    description: str = ""
+    version: Optional[str] = None
+    author: Optional[str] = None
+    enabled: bool = True
+    installState: PluginInstallState = "not_installed"
+    installedPluginId: Optional[int] = None
+    installedPluginIds: Dict[PluginRuntime, int] = Field(default_factory=dict)
+    variantIds: Dict[PluginRuntime, int] = Field(default_factory=dict)
+    sourceChecksum: Optional[str] = None
+    installedChecksum: Optional[str] = None
+    components: InstalledPluginComponents = Field(
+        default_factory=InstalledPluginComponents
+    )
+
+
+class PluginCatalogListResponse(BaseModel):
+    """Response for user-facing plugin catalog."""
+
+    items: List[PluginCatalogItem]
+
+
 class InstalledPluginUpdateRequest(BaseModel):
     """Request to update installed plugin runtime state."""
 
@@ -120,6 +168,14 @@ class InstalledPluginUpdateRequest(BaseModel):
     description: Optional[str] = None
 
 
+class SystemPluginUpdateRequest(BaseModel):
+    """Request to update system plugin catalog metadata."""
+
+    displayName: Optional[str] = None
+    description: Optional[str] = None
+    enabled: Optional[bool] = None
+
+
 class PluginUploadInfo(BaseModel):
     """Normalized plugin metadata parsed from an uploaded package."""
 
diff --git a/backend/app/services/device/capability_sync_service.py b/backend/app/services/device/capability_sync_service.py
index 70c46e2640..ad93c99dd3 100644
--- a/backend/app/services/device/capability_sync_service.py
+++ b/backend/app/services/device/capability_sync_service.py
@@ -646,6 +646,7 @@ def _plugin_payload(self, installed: Kind) -> dict[str, Any]:
             "marketplace": marketplace,
             "version": spec.get("version"),
             "source": source,
+            "runtime": spec.get("runtime") or source.get("runtime") or "claudecode",
         }
         component_states = spec.get("componentStates") or {}
         if component_states:
diff --git a/backend/app/services/installed_plugin_service.py b/backend/app/services/installed_plugin_service.py
index 1d0f667dad..35e5b4d60d 100644
--- a/backend/app/services/installed_plugin_service.py
+++ b/backend/app/services/installed_plugin_service.py
@@ -17,7 +17,12 @@
     InstalledPluginListResponse,
     InstalledPluginPackageRef,
     InstalledPluginUpdateRequest,
+    PluginCatalogItem,
+    PluginCatalogListResponse,
+    PluginRuntime,
     PluginUploadInfo,
+    SystemPlugin,
+    SystemPluginListResponse,
 )
 from app.services.claude_plugin_parser import claude_plugin_parser
 
@@ -25,6 +30,235 @@
 class InstalledPluginService:
     """Manage user-scoped Claude Code plugin installations."""
 
+    REQUIRED_SYSTEM_PLUGIN_RUNTIMES: tuple[PluginRuntime, ...] = ("claudecode", "codex")
+
+    def upload_system_plugin(
+        self,
+        *,
+        db: Session,
+        package_bytes: bytes,
+        filename: str,
+        enabled: bool = True,
+        runtime: PluginRuntime = "claudecode",
+    ) -> SystemPlugin:
+        parsed = claude_plugin_parser.parse_package(package_bytes)
+        file_hash = hashlib.sha256(package_bytes).hexdigest()
+        existing = self._find_system_plugin(db, plugin_key=parsed.name, runtime=runtime)
+        if existing:
+            return self._replace_system_plugin(
+                db,
+                row=existing,
+                parsed=parsed,
+                package_bytes=package_bytes,
+                file_hash=file_hash,
+                filename=filename,
+                enabled=enabled,
+                runtime=runtime,
+            )
+
+        row = Kind(
+            user_id=0,
+            kind="Plugin",
+            name=self._safe_kind_name(f"{parsed.name}-{runtime}"),
+            namespace="default",
+            json={},
+            is_active=True,
+        )
+        db.add(row)
+        db.flush()
+        package_ref = self._package_ref(row.id, file_hash, len(package_bytes))
+        row.json = self._build_payload(
+            kind="Plugin",
+            name=parsed.name,
+            parsed=parsed,
+            package_ref=package_ref,
+            enabled=enabled,
+            filename=filename,
+            source_type="upload",
+            runtime=runtime,
+        )
+        self._upsert_package(
+            db,
+            kind_id=row.id,
+            package_bytes=package_bytes,
+            file_hash=file_hash,
+            filename=filename,
+        )
+        db.commit()
+        db.refresh(row)
+        return self._kind_to_system_plugin(row)
+
+    def list_system_plugins(self, *, db: Session) -> SystemPluginListResponse:
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .order_by(Kind.updated_at.desc())
+            .all()
+        )
+        return SystemPluginListResponse(
+            total=len(rows),
+            items=[self._kind_to_system_plugin(row) for row in rows],
+        )
+
+    def list_system_plugin_catalog(
+        self, *, db: Session, user_id: int
+    ) -> PluginCatalogListResponse:
+        system_rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .order_by(Kind.updated_at.desc())
+            .all()
+        )
+        installed_by_system_id = self._installed_plugins_by_system_id(
+            db, user_id=user_id
+        )
+        grouped = self._group_system_plugin_rows(system_rows)
+        items = []
+        for variants in grouped.values():
+            if not self._is_complete_enabled_variant_group(variants):
+                continue
+            items.append(
+                self._system_group_to_catalog_item(variants, installed_by_system_id)
+            )
+        return PluginCatalogListResponse(items=items)
+
+    def update_system_plugin_metadata(
+        self,
+        *,
+        db: Session,
+        system_plugin_id: int,
+        display_name: Optional[str] = None,
+        description: Optional[str] = None,
+        enabled: Optional[bool] = None,
+    ) -> SystemPlugin:
+        row = self._get_active_system_plugin(db, system_plugin_id=system_plugin_id)
+        plugin_key = self._plugin_key_from_row(row)
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .all()
+        )
+        for candidate in rows:
+            if self._plugin_key_from_row(candidate) != plugin_key:
+                continue
+            spec = self._get_spec(candidate)
+            if display_name is not None:
+                spec["displayName"] = display_name
+            if description is not None:
+                spec["description"] = description
+            if enabled is not None:
+                spec["enabled"] = enabled
+            candidate.json["spec"] = spec
+            flag_modified(candidate, "json")
+        db.commit()
+        db.refresh(row)
+        return self._kind_to_system_plugin(row)
+
+    def delete_system_plugin(self, *, db: Session, system_plugin_id: int) -> None:
+        row = self._get_active_system_plugin(db, system_plugin_id=system_plugin_id)
+        spec = self._get_spec(row)
+        spec["enabled"] = False
+        row.json["spec"] = spec
+        row.is_active = False
+        flag_modified(row, "json")
+        db.commit()
+
+    def replace_system_plugin_package(
+        self,
+        *,
+        db: Session,
+        system_plugin_id: int,
+        package_bytes: bytes,
+        filename: str,
+    ) -> SystemPlugin:
+        row = self._get_active_system_plugin(db, system_plugin_id=system_plugin_id)
+        parsed = claude_plugin_parser.parse_package(package_bytes)
+        current_spec = self._get_spec(row)
+        current_plugin_key = current_spec.get("source", {}).get("pluginKey")
+        runtime = self._runtime_from_spec(current_spec)
+        if parsed.name != current_plugin_key:
+            raise HTTPException(
+                status_code=400,
+                detail="Replacement plugin package must use the same plugin name",
+            )
+        file_hash = hashlib.sha256(package_bytes).hexdigest()
+        return self._replace_system_plugin(
+            db,
+            row=row,
+            parsed=parsed,
+            package_bytes=package_bytes,
+            file_hash=file_hash,
+            filename=filename,
+            enabled=current_spec.get("enabled", True),
+            runtime=runtime,
+            display_name=current_spec.get("displayName"),
+            description=current_spec.get("description"),
+        )
+
+    def install_system_plugin(
+        self, *, db: Session, user_id: int, system_plugin_id: int
+    ) -> InstalledPluginListResponse:
+        system_row = self._get_enabled_system_plugin(
+            db, system_plugin_id=system_plugin_id
+        )
+        variants = self._complete_enabled_variants_for_row(db, system_row)
+        installed_items = []
+        for variant in self._ordered_variant_rows(variants):
+            existing = self._find_installed_system_plugin(
+                db, user_id=user_id, system_plugin_id=variant.id
+            )
+            if existing and existing.is_active:
+                installed_items.append(self._kind_to_installed_plugin(existing))
+                continue
+            installed_items.append(
+                self._copy_system_plugin_to_installed(
+                    db,
+                    user_id=user_id,
+                    system_row=variant,
+                    row=existing,
+                )
+            )
+        return InstalledPluginListResponse(items=installed_items)
+
+    def update_installed_plugin_from_system(
+        self, *, db: Session, user_id: int, system_plugin_id: int
+    ) -> InstalledPluginListResponse:
+        system_row = self._get_enabled_system_plugin(
+            db, system_plugin_id=system_plugin_id
+        )
+        variants = self._complete_enabled_variants_for_row(db, system_row)
+        installed_items = []
+        for variant in self._ordered_variant_rows(variants):
+            installed = self._find_installed_system_plugin(
+                db, user_id=user_id, system_plugin_id=variant.id
+            )
+            if not installed or not installed.is_active:
+                installed = None
+            installed_items.append(
+                self._copy_system_plugin_to_installed(
+                    db,
+                    user_id=user_id,
+                    system_row=variant,
+                    row=installed,
+                )
+            )
+        return InstalledPluginListResponse(items=installed_items)
+
     def upload_plugin(
         self,
         *,
@@ -62,11 +296,14 @@ def upload_plugin(
         db.flush()
         package_ref = self._package_ref(row.id, file_hash, len(package_bytes))
         row.json = self._build_payload(
+            kind="InstalledPlugin",
             name=parsed.name,
             parsed=parsed,
             package_ref=package_ref,
             enabled=enabled,
             filename=filename,
+            source_type="upload",
+            runtime="claudecode",
         )
         self._upsert_package(
             db,
@@ -169,11 +406,14 @@ def _reactivate_existing(
     ) -> InstalledPlugin:
         package_ref = self._package_ref(row.id, file_hash, len(package_bytes))
         row.json = self._build_payload(
+            kind="InstalledPlugin",
             name=parsed.name,
             parsed=parsed,
             package_ref=package_ref,
             enabled=enabled,
             filename=filename,
+            source_type="upload",
+            runtime="claudecode",
         )
         row.is_active = True
         flag_modified(row, "json")
@@ -210,6 +450,28 @@ def _find_uploaded_plugin(
                 return row
         return None
 
+    def _find_system_plugin(
+        self, db: Session, *, plugin_key: str, runtime: PluginRuntime
+    ) -> Optional[Kind]:
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+            )
+            .all()
+        )
+        for row in rows:
+            source = self._get_spec(row).get("source", {})
+            if (
+                isinstance(source, dict)
+                and source.get("pluginKey") == plugin_key
+                and self._runtime_from_spec(self._get_spec(row)) == runtime
+            ):
+                return row
+        return None
+
     def _get_active_installed_plugin(
         self, db: Session, *, user_id: int, installed_id: int
     ) -> Kind:
@@ -231,22 +493,31 @@ def _get_active_installed_plugin(
     def _build_payload(
         self,
         *,
+        kind: str,
         name: str,
         parsed: PluginUploadInfo,
         package_ref: InstalledPluginPackageRef,
         enabled: bool,
         filename: str,
+        source_type: str,
+        runtime: PluginRuntime,
     ) -> Dict[str, Any]:
+        provider_key = "codex" if runtime == "codex" else "claude-code"
         return {
             "apiVersion": "agent.wecode.io/v1",
-            "kind": "InstalledPlugin",
-            "metadata": {"name": self._safe_kind_name(name), "namespace": "default"},
+            "kind": kind,
+            "metadata": {
+                "name": self._safe_kind_name(f"{name}-{runtime}"),
+                "namespace": "default",
+            },
             "spec": {
                 "source": {
-                    "type": "upload",
-                    "providerKey": "claude-code",
+                    "type": source_type,
+                    "providerKey": provider_key,
                     "pluginKey": name,
+                    "runtime": runtime,
                 },
+                "runtime": runtime,
                 "displayName": parsed.displayName,
                 "description": parsed.description,
                 "version": parsed.version,
@@ -262,6 +533,328 @@ def _build_payload(
             "status": {"state": "Available"},
         }
 
+    def _replace_system_plugin(
+        self,
+        db: Session,
+        *,
+        row: Kind,
+        parsed: PluginUploadInfo,
+        package_bytes: bytes,
+        file_hash: str,
+        filename: str,
+        enabled: bool,
+        runtime: PluginRuntime,
+        display_name: Optional[str] = None,
+        description: Optional[str] = None,
+    ) -> SystemPlugin:
+        package_ref = self._package_ref(row.id, file_hash, len(package_bytes))
+        row.json = self._build_payload(
+            kind="Plugin",
+            name=parsed.name,
+            parsed=parsed,
+            package_ref=package_ref,
+            enabled=enabled,
+            filename=filename,
+            source_type="upload",
+            runtime=runtime,
+        )
+        spec = self._get_spec(row)
+        if display_name is not None:
+            spec["displayName"] = display_name
+        if description is not None:
+            spec["description"] = description
+        row.json["spec"] = spec
+        row.is_active = True
+        flag_modified(row, "json")
+        self._upsert_package(
+            db,
+            kind_id=row.id,
+            package_bytes=package_bytes,
+            file_hash=file_hash,
+            filename=filename,
+        )
+        db.commit()
+        db.refresh(row)
+        return self._kind_to_system_plugin(row)
+
+    def _get_active_system_plugin(self, db: Session, *, system_plugin_id: int) -> Kind:
+        row = (
+            db.query(Kind)
+            .filter(
+                Kind.id == system_plugin_id,
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .first()
+        )
+        if not row:
+            raise HTTPException(status_code=404, detail="System plugin not found")
+        return row
+
+    def _get_enabled_system_plugin(self, db: Session, *, system_plugin_id: int) -> Kind:
+        row = self._get_active_system_plugin(db, system_plugin_id=system_plugin_id)
+        if not self._get_spec(row).get("enabled", True):
+            raise HTTPException(status_code=404, detail="System plugin not found")
+        return row
+
+    def _complete_enabled_variants_for_row(
+        self, db: Session, system_row: Kind
+    ) -> dict[PluginRuntime, Kind]:
+        plugin_key = self._plugin_key_from_row(system_row)
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == 0,
+                Kind.kind == "Plugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .all()
+        )
+        grouped = self._group_system_plugin_rows(rows)
+        variants = grouped.get(plugin_key, {})
+        if not self._is_complete_enabled_variant_group(variants):
+            raise HTTPException(
+                status_code=404,
+                detail="System plugin must include enabled ClaudeCode and Codex packages",
+            )
+        return variants
+
+    def _group_system_plugin_rows(
+        self, rows: list[Kind]
+    ) -> dict[str, dict[PluginRuntime, Kind]]:
+        grouped: dict[str, dict[PluginRuntime, Kind]] = {}
+        for row in rows:
+            plugin_key = self._plugin_key_from_row(row)
+            if not plugin_key:
+                continue
+            runtime = self._runtime_from_spec(self._get_spec(row))
+            grouped.setdefault(plugin_key, {})[runtime] = row
+        return grouped
+
+    def _is_complete_enabled_variant_group(
+        self, variants: dict[PluginRuntime, Kind]
+    ) -> bool:
+        for runtime in self.REQUIRED_SYSTEM_PLUGIN_RUNTIMES:
+            row = variants.get(runtime)
+            if not row or not self._get_spec(row).get("enabled", True):
+                return False
+        return True
+
+    def _ordered_variant_rows(self, variants: dict[PluginRuntime, Kind]) -> list[Kind]:
+        return [variants[runtime] for runtime in self.REQUIRED_SYSTEM_PLUGIN_RUNTIMES]
+
+    def _plugin_key_from_row(self, row: Kind) -> str:
+        spec = self._get_spec(row)
+        source = spec.get("source") or {}
+        if isinstance(source, dict):
+            plugin_key = source.get("pluginKey")
+            if isinstance(plugin_key, str) and plugin_key:
+                return plugin_key
+        return row.name
+
+    def _runtime_from_spec(self, spec: dict[str, Any]) -> PluginRuntime:
+        value = spec.get("runtime")
+        if value not in self.REQUIRED_SYSTEM_PLUGIN_RUNTIMES:
+            source = spec.get("source") or {}
+            if isinstance(source, dict):
+                value = source.get("runtime")
+        return "codex" if value == "codex" else "claudecode"
+
+    def _installed_plugins_by_system_id(
+        self, db: Session, *, user_id: int
+    ) -> dict[int, Kind]:
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == user_id,
+                Kind.kind == "InstalledPlugin",
+                Kind.namespace == "default",
+                Kind.is_active == True,
+            )
+            .all()
+        )
+        result: dict[int, Kind] = {}
+        for row in rows:
+            source = self._get_spec(row).get("source", {})
+            system_id = self._system_plugin_id_from_source(source)
+            if system_id is not None:
+                result[system_id] = row
+        return result
+
+    def _find_installed_system_plugin(
+        self, db: Session, *, user_id: int, system_plugin_id: int
+    ) -> Optional[Kind]:
+        rows = (
+            db.query(Kind)
+            .filter(
+                Kind.user_id == user_id,
+                Kind.kind == "InstalledPlugin",
+                Kind.namespace == "default",
+            )
+            .all()
+        )
+        for row in rows:
+            source = self._get_spec(row).get("source", {})
+            if self._system_plugin_id_from_source(source) == system_plugin_id:
+                return row
+        return None
+
+    def _system_plugin_id_from_source(self, source: Any) -> Optional[int]:
+        if not isinstance(source, dict) or source.get("type") != "system":
+            return None
+        value = source.get("systemPluginId") or source.get("catalogItemId")
+        try:
+            parsed = int(value)
+        except (TypeError, ValueError):
+            return None
+        return parsed if parsed > 0 else None
+
+    def _system_group_to_catalog_item(
+        self,
+        variants: dict[PluginRuntime, Kind],
+        installed_by_system_id: dict[int, Kind],
+    ) -> PluginCatalogItem:
+        primary = variants["claudecode"]
+        spec = self._get_spec(primary)
+        package_ref = spec.get("packageRef") or {}
+        installed_by_runtime: dict[PluginRuntime, Kind] = {}
+        for runtime, row in variants.items():
+            installed = installed_by_system_id.get(row.id)
+            if installed:
+                installed_by_runtime[runtime] = installed
+        installed = installed_by_runtime.get("claudecode")
+        installed_spec = self._get_spec(installed) if installed else {}
+        installed_ref = installed_spec.get("packageRef") or {}
+        source_checksum = package_ref.get("checksum")
+        installed_checksum = installed_ref.get("checksum")
+        install_state = "not_installed"
+        installed_id = None
+        if installed_by_runtime:
+            installed_id = installed.id
+            install_state = "installed"
+            for runtime, row in variants.items():
+                variant_ref = self._get_spec(row).get("packageRef") or {}
+                installed_row = installed_by_runtime.get(runtime)
+                installed_ref = (
+                    self._get_spec(installed_row).get("packageRef")
+                    if installed_row
+                    else {}
+                ) or {}
+                if not installed_row or variant_ref.get(
+                    "checksum"
+                ) != installed_ref.get("checksum"):
+                    install_state = "update_available"
+                    break
+        return PluginCatalogItem(
+            id=primary.id,
+            name=spec.get("source", {}).get("pluginKey") or primary.name,
+            displayName=spec.get("displayName") or primary.name,
+            description=spec.get("description") or "",
+            version=spec.get("version"),
+            author=spec.get("author"),
+            enabled=spec.get("enabled", True),
+            installState=install_state,
+            installedPluginId=installed_id,
+            installedPluginIds={
+                runtime: row.id for runtime, row in installed_by_runtime.items()
+            },
+            variantIds={runtime: row.id for runtime, row in variants.items()},
+            sourceChecksum=source_checksum,
+            installedChecksum=installed_checksum,
+            components=spec.get("components") or {},
+        )
+
+    def _copy_system_plugin_to_installed(
+        self,
+        db: Session,
+        *,
+        user_id: int,
+        system_row: Kind,
+        row: Optional[Kind],
+    ) -> InstalledPlugin:
+        package = (
+            db.query(SkillBinary).filter(SkillBinary.kind_id == system_row.id).first()
+        )
+        if not package or not package.binary_data:
+            raise HTTPException(
+                status_code=404, detail="System plugin package not found"
+            )
+        if row is None:
+            row = Kind(
+                user_id=user_id,
+                kind="InstalledPlugin",
+                name=system_row.name,
+                namespace="default",
+                json={},
+                is_active=True,
+            )
+            db.add(row)
+            db.flush()
+        previous_spec = self._get_spec(row)
+        row.json = self._installed_payload_from_system(
+            row=row,
+            system_row=system_row,
+            package=package,
+            enabled=previous_spec.get("enabled", True),
+            component_states=previous_spec.get("componentStates"),
+        )
+        row.is_active = True
+        flag_modified(row, "json")
+        self._upsert_package(
+            db,
+            kind_id=row.id,
+            package_bytes=package.binary_data,
+            file_hash=package.file_hash,
+            filename=package.file_name or f"{system_row.name}.zip",
+        )
+        db.commit()
+        db.refresh(row)
+        return self._kind_to_installed_plugin(row)
+
+    def _installed_payload_from_system(
+        self,
+        *,
+        row: Kind,
+        system_row: Kind,
+        package: SkillBinary,
+        enabled: bool,
+        component_states: Optional[Dict[str, bool]],
+    ) -> Dict[str, Any]:
+        payload = dict(system_row.json)
+        payload["kind"] = "InstalledPlugin"
+        metadata = dict(payload.get("metadata") or {})
+        metadata["name"] = row.name
+        metadata["namespace"] = "default"
+        payload["metadata"] = metadata
+        spec = dict(payload.get("spec") or {})
+        source = dict(spec.get("source") or {})
+        source.update(
+            {
+                "type": "system",
+                "catalogItemId": str(system_row.id),
+                "systemPluginId": system_row.id,
+            }
+        )
+        spec["source"] = source
+        spec["installState"] = "installed"
+        spec["enabled"] = enabled
+        if component_states:
+            spec["componentStates"] = component_states
+        spec["packageRef"] = self._package_ref(
+            row.id,
+            package.file_hash,
+            package.file_size,
+        ).model_dump()
+        spec["sourcePayload"] = {
+            "filename": package.file_name,
+            "systemPluginId": system_row.id,
+        }
+        payload["spec"] = spec
+        return payload
+
     def _default_component_states(self, parsed: PluginUploadInfo) -> Dict[str, bool]:
         components = parsed.components
         states: Dict[str, bool] = {}
@@ -347,6 +940,15 @@ def _kind_to_installed_plugin(self, row: Kind) -> InstalledPlugin:
         payload["metadata"] = metadata
         return InstalledPlugin.model_validate(payload)
 
+    def _kind_to_system_plugin(self, row: Kind) -> SystemPlugin:
+        payload = dict(row.json)
+        metadata = dict(payload.get("metadata", {}))
+        labels = dict(metadata.get("labels", {}))
+        labels["id"] = str(row.id)
+        metadata["labels"] = labels
+        payload["metadata"] = metadata
+        return SystemPlugin.model_validate(payload)
+
     def _get_spec(self, row: Kind) -> Dict[str, Any]:
         payload = row.json if isinstance(row.json, dict) else {}
         spec = payload.get("spec", {})
diff --git a/backend/tests/api/endpoints/test_plugins_api.py b/backend/tests/api/endpoints/test_plugins_api.py
new file mode 100644
index 0000000000..2c2b4f8cd8
--- /dev/null
+++ b/backend/tests/api/endpoints/test_plugins_api.py
@@ -0,0 +1,175 @@
+# SPDX-FileCopyrightText: 2026 Weibo, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import io
+import json
+import zipfile
+
+from fastapi.testclient import TestClient
+from sqlalchemy.orm import Session
+
+from app.services.installed_plugin_service import installed_plugin_service
+
+
+def _plugin_zip(name: str = "superpowers", version: str = "1.0.0") -> bytes:
+    buffer = io.BytesIO()
+    with zipfile.ZipFile(buffer, "w") as archive:
+        archive.writestr(
+            ".claude-plugin/plugin.json",
+            json.dumps(
+                {
+                    "name": name,
+                    "displayName": "Superpowers",
+                    "description": "System plugin",
+                    "version": version,
+                }
+            ),
+        )
+        archive.writestr("commands/test.md", "# Test")
+    return buffer.getvalue()
+
+
+def _auth_headers(token: str) -> dict[str, str]:
+    return {"Authorization": f"Bearer {token}"}
+
+
+def test_user_can_install_and_manually_update_system_plugin(
+    test_client: TestClient,
+    test_db: Session,
+    test_token: str,
+    test_user,
+):
+    claudecode_plugin = installed_plugin_service.upload_system_plugin(
+        db=test_db,
+        package_bytes=_plugin_zip(version="1.0.0"),
+        filename="superpowers-1.0.0.zip",
+        runtime="claudecode",
+    )
+    codex_plugin = installed_plugin_service.upload_system_plugin(
+        db=test_db,
+        package_bytes=_plugin_zip(version="1.0.0"),
+        filename="superpowers-codex-1.0.0.zip",
+        runtime="codex",
+    )
+    system_plugin_id = int(claudecode_plugin.metadata["labels"]["id"])
+    codex_plugin_id = int(codex_plugin.metadata["labels"]["id"])
+
+    catalog_response = test_client.get(
+        "/api/plugins/catalog",
+        headers=_auth_headers(test_token),
+    )
+    assert catalog_response.status_code == 200
+    assert catalog_response.json()["items"][0]["installState"] == "not_installed"
+    assert catalog_response.json()["items"][0]["variantIds"] == {
+        "claudecode": system_plugin_id,
+        "codex": codex_plugin_id,
+    }
+
+    install_response = test_client.post(
+        f"/api/plugins/catalog/{system_plugin_id}/install",
+        headers=_auth_headers(test_token),
+    )
+    assert install_response.status_code == 201
+    installed_items = install_response.json()["items"]
+    assert {item["spec"]["runtime"] for item in installed_items} == {
+        "claudecode",
+        "codex",
+    }
+    installed_by_runtime = {
+        item["spec"]["runtime"]: int(item["metadata"]["labels"]["id"])
+        for item in installed_items
+    }
+    installed_id = installed_by_runtime["claudecode"]
+
+    installed_package = installed_plugin_service.package_data_for_download(
+        db=test_db,
+        user_id=test_user.id,
+        installed_id=installed_id,
+    )
+    assert installed_package[1] == "superpowers-1.0.0.zip"
+
+    installed_plugin_service.replace_system_plugin_package(
+        db=test_db,
+        system_plugin_id=system_plugin_id,
+        package_bytes=_plugin_zip(version="2.0.0"),
+        filename="superpowers-2.0.0.zip",
+    )
+    installed_plugin_service.replace_system_plugin_package(
+        db=test_db,
+        system_plugin_id=codex_plugin_id,
+        package_bytes=_plugin_zip(version="2.0.0"),
+        filename="superpowers-codex-2.0.0.zip",
+    )
+
+    catalog_response = test_client.get(
+        "/api/plugins/catalog",
+        headers=_auth_headers(test_token),
+    )
+    catalog_item = catalog_response.json()["items"][0]
+    assert catalog_item["installState"] == "update_available"
+    assert catalog_item["installedPluginId"] == installed_id
+
+    update_response = test_client.post(
+        f"/api/plugins/catalog/{system_plugin_id}/update",
+        headers=_auth_headers(test_token),
+    )
+    assert update_response.status_code == 200
+    assert all(
+        item["spec"]["version"] == "2.0.0" for item in update_response.json()["items"]
+    )
+
+    updated_package = installed_plugin_service.package_data_for_download(
+        db=test_db,
+        user_id=test_user.id,
+        installed_id=installed_id,
+    )
+    assert updated_package[1] == "superpowers-2.0.0.zip"
+
+
+def test_admin_can_manage_system_plugin_catalog(
+    test_client: TestClient,
+    test_admin_token: str,
+):
+    upload_response = test_client.post(
+        "/api/admin/plugins",
+        headers=_auth_headers(test_admin_token),
+        files={"file": ("superpowers.zip", _plugin_zip(), "application/zip")},
+        data={"enabled": "true"},
+    )
+    assert upload_response.status_code == 201
+    plugin_id = int(upload_response.json()["metadata"]["labels"]["id"])
+
+    update_response = test_client.put(
+        f"/api/admin/plugins/{plugin_id}",
+        headers=_auth_headers(test_admin_token),
+        json={
+            "displayName": "Managed Plugin",
+            "description": "Visible in Wework",
+            "enabled": False,
+        },
+    )
+    assert update_response.status_code == 200
+    assert update_response.json()["spec"]["displayName"] == "Managed Plugin"
+    assert update_response.json()["spec"]["enabled"] is False
+
+    list_response = test_client.get(
+        "/api/admin/plugins",
+        headers=_auth_headers(test_admin_token),
+    )
+    assert list_response.status_code == 200
+    assert list_response.json()["total"] == 1
+
+    replace_response = test_client.put(
+        f"/api/admin/plugins/{plugin_id}/package",
+        headers=_auth_headers(test_admin_token),
+        files={
+            "file": (
+                "superpowers-2.0.0.zip",
+                _plugin_zip(version="2.0.0"),
+                "application/zip",
+            )
+        },
+    )
+    assert replace_response.status_code == 200
+    assert replace_response.json()["spec"]["version"] == "2.0.0"
diff --git a/backend/tests/services/device/test_capability_sync_service.py b/backend/tests/services/device/test_capability_sync_service.py
index 796d19359d..827c5caf76 100644
--- a/backend/tests/services/device/test_capability_sync_service.py
+++ b/backend/tests/services/device/test_capability_sync_service.py
@@ -173,6 +173,7 @@ def test_resolve_payload_uses_uploaded_plugin_key_and_download_ref(test_db):
                     "providerKey": "claude-code",
                     "pluginKey": "superpowers",
                 },
+                "runtime": "claudecode",
                 "displayName": "Superpowers",
                 "description": "Core skills",
                 "version": "5.0.7",
@@ -211,6 +212,7 @@ def test_resolve_payload_uses_uploaded_plugin_key_and_download_ref(test_db):
                 "providerKey": "claude-code",
                 "pluginKey": "superpowers",
             },
+            "runtime": "claudecode",
             "checksum": "sha256:abc123",
             "download_path": "/api/plugins/installed/302/download",
         }
diff --git a/backend/tests/services/test_installed_plugin_upload.py b/backend/tests/services/test_installed_plugin_upload.py
index ba64485ef6..a6d7a64a54 100644
--- a/backend/tests/services/test_installed_plugin_upload.py
+++ b/backend/tests/services/test_installed_plugin_upload.py
@@ -25,7 +25,7 @@ async def read(self, _size: int) -> bytes:
         return self._chunks.pop(0)
 
 
-def _create_plugin_zip(name: str = "superpowers") -> bytes:
+def _create_plugin_zip(name: str = "superpowers", version: str = "1.0.0") -> bytes:
     buffer = io.BytesIO()
     with zipfile.ZipFile(buffer, "w") as archive:
         archive.writestr(
@@ -35,7 +35,7 @@ def _create_plugin_zip(name: str = "superpowers") -> bytes:
                     "name": name,
                     "displayName": "Superpowers",
                     "description": "Test plugin",
-                    "version": "1.0.0",
+                    "version": version,
                 }
             ),
         )
@@ -87,3 +87,135 @@ def test_upload_plugin_stores_package_in_database(test_db, test_user):
     )
     assert downloaded_bytes == package_bytes
     assert filename == "superpowers.zip"
+
+
+def test_system_plugin_catalog_install_and_manual_update_flow(test_db, test_user):
+    service = InstalledPluginService()
+    package_v1 = _create_plugin_zip(version="1.0.0")
+    package_v2 = _create_plugin_zip(version="2.0.0")
+
+    claudecode_plugin = service.upload_system_plugin(
+        db=test_db,
+        package_bytes=package_v1,
+        filename="superpowers-1.0.0.zip",
+        enabled=True,
+        runtime="claudecode",
+    )
+    codex_plugin = service.upload_system_plugin(
+        db=test_db,
+        package_bytes=package_v1,
+        filename="superpowers-codex-1.0.0.zip",
+        enabled=True,
+        runtime="codex",
+    )
+    claudecode_plugin_id = int(claudecode_plugin.metadata["labels"]["id"])
+    codex_plugin_id = int(codex_plugin.metadata["labels"]["id"])
+
+    catalog = service.list_system_plugin_catalog(db=test_db, user_id=test_user.id)
+    assert len(catalog.items) == 1
+    catalog_item = catalog.items[0]
+    assert catalog_item.id == claudecode_plugin_id
+    assert catalog_item.variantIds == {
+        "claudecode": claudecode_plugin_id,
+        "codex": codex_plugin_id,
+    }
+    assert catalog_item.installState == "not_installed"
+    assert catalog_item.installedPluginId is None
+
+    installed_response = service.install_system_plugin(
+        db=test_db,
+        user_id=test_user.id,
+        system_plugin_id=claudecode_plugin_id,
+    )
+    assert len(installed_response.items) == 2
+    installed_by_runtime = {
+        item.spec.runtime: int(item.metadata["labels"]["id"])
+        for item in installed_response.items
+    }
+    installed_id = installed_by_runtime["claudecode"]
+    codex_installed_id = installed_by_runtime["codex"]
+
+    catalog = service.list_system_plugin_catalog(db=test_db, user_id=test_user.id)
+    assert catalog.items[0].installState == "installed"
+    assert catalog.items[0].installedPluginId == installed_id
+    assert catalog.items[0].installedPluginIds == {
+        "claudecode": installed_id,
+        "codex": codex_installed_id,
+    }
+
+    service.update_system_plugin_metadata(
+        db=test_db,
+        system_plugin_id=claudecode_plugin_id,
+        display_name="Curated Superpowers",
+        description="Reviewed by admin",
+    )
+
+    service.replace_system_plugin_package(
+        db=test_db,
+        system_plugin_id=claudecode_plugin_id,
+        package_bytes=package_v2,
+        filename="superpowers-2.0.0.zip",
+    )
+    service.replace_system_plugin_package(
+        db=test_db,
+        system_plugin_id=codex_plugin_id,
+        package_bytes=package_v2,
+        filename="superpowers-codex-2.0.0.zip",
+    )
+
+    catalog = service.list_system_plugin_catalog(db=test_db, user_id=test_user.id)
+    assert catalog.items[0].installState == "update_available"
+    assert catalog.items[0].version == "2.0.0"
+    assert catalog.items[0].displayName == "Curated Superpowers"
+    assert catalog.items[0].description == "Reviewed by admin"
+
+    downloaded_bytes, filename = service.package_data_for_download(
+        db=test_db,
+        user_id=test_user.id,
+        installed_id=installed_id,
+    )
+    assert downloaded_bytes == package_v1
+    assert filename == "superpowers-1.0.0.zip"
+
+    updated_response = service.update_installed_plugin_from_system(
+        db=test_db,
+        user_id=test_user.id,
+        system_plugin_id=claudecode_plugin_id,
+    )
+    assert {item.spec.runtime for item in updated_response.items} == {
+        "claudecode",
+        "codex",
+    }
+    assert all(item.spec.version == "2.0.0" for item in updated_response.items)
+
+    downloaded_bytes, filename = service.package_data_for_download(
+        db=test_db,
+        user_id=test_user.id,
+        installed_id=installed_id,
+    )
+    assert downloaded_bytes == package_v2
+    assert filename == "superpowers-2.0.0.zip"
+
+
+def test_disabled_system_plugin_is_hidden_from_user_catalog(test_db, test_user):
+    service = InstalledPluginService()
+    system_plugin = service.upload_system_plugin(
+        db=test_db,
+        package_bytes=_create_plugin_zip(),
+        filename="superpowers.zip",
+        enabled=True,
+        runtime="claudecode",
+    )
+    system_plugin_id = int(system_plugin.metadata["labels"]["id"])
+
+    service.update_system_plugin_metadata(
+        db=test_db,
+        system_plugin_id=system_plugin_id,
+        display_name="Internal Only",
+        description="Hidden from users",
+        enabled=False,
+    )
+
+    catalog = service.list_system_plugin_catalog(db=test_db, user_id=test_user.id)
+
+    assert catalog.items == []
diff --git a/docs/en/developer-guide/system-plugin-management.md b/docs/en/developer-guide/system-plugin-management.md
new file mode 100644
index 0000000000..00feaaa2f3
--- /dev/null
+++ b/docs/en/developer-guide/system-plugin-management.md
@@ -0,0 +1,73 @@
+---
+sidebar_position: 33
+---
+
+# System Plugin Management
+
+System plugin management lets administrators maintain plugins shown to all users. Each logical plugin has separate ClaudeCode and Codex runtime ZIP packages. Users see one combined plugin in Wework, and installing or updating it deploys both runtime variants.
+
+## Data Model
+
+System plugins reuse the existing CRD storage model:
+
+- Admin-managed plugins use `Kind.kind = "Plugin"` with `user_id = 0` as system catalog entries.
+- Variants of the same logical plugin are grouped by `spec.source.pluginKey`, with `spec.runtime = "claudecode"` or `"codex"` identifying the runtime package.
+- User installations still use `Kind.kind = "InstalledPlugin"` and belong to the current user.
+- ZIP package bytes reuse `SkillBinary` with `type = "plugin"`.
+
+System catalog entries and user installations are linked through `spec.source.systemPluginId`. Installing a system plugin copies the manifest, component inventory, and package reference into a user-owned installation instead of sharing user-editable runtime state. The user catalog only shows logical plugins whose ClaudeCode and Codex variants both exist and are enabled.
+
+## Administrator Capabilities
+
+The admin entry point is in the main frontend:
+
+```text
+System Administration -> Plugins
+```
+
+Supported operations:
+
+- Upload a ZIP to create or replace a system plugin catalog entry and choose the runtime version.
+- Edit display name and description.
+- Enable or disable a catalog entry. If either runtime variant is disabled, the combined plugin is hidden from the user catalog.
+- Re-upload a ZIP to replace the plugin package version.
+- Delete a system plugin catalog entry.
+
+When replacing the ZIP, the new package must keep the same plugin name as the original package. This prevents updating user installations to a different plugin by mistake.
+
+## User Installation And Updates
+
+The Wework plugin management page only shows the system plugin catalog. It no longer provides a user upload entry for plugin ZIP packages. Users can:
+
+- Install system plugins. One install creates both ClaudeCode and Codex `InstalledPlugin` records.
+- Enable or disable their own installed plugins.
+- See an update-available state after an administrator replaces the system plugin package.
+- Manually update both installed runtime variants to the new system plugin package version.
+
+Updates use a manual confirmation policy. Replacing a system package does not automatically modify user installations; it only makes the catalog API return `installState = "update_available"`. Install and update APIs return an `items` array containing both runtime installation results.
+
+## API
+
+Administrator APIs:
+
+```text
+GET    /api/admin/plugins
+POST   /api/admin/plugins
+PUT    /api/admin/plugins/{system_plugin_id}
+PUT    /api/admin/plugins/{system_plugin_id}/package
+DELETE /api/admin/plugins/{system_plugin_id}
+```
+
+User APIs:
+
+```text
+GET  /api/plugins/catalog
+POST /api/plugins/catalog/{system_plugin_id}/install
+POST /api/plugins/catalog/{system_plugin_id}/update
+```
+
+Installing or updating a plugin triggers global capability sync so online devices receive the plugin changes.
+
+## Frontend Responsibilities
+
+The main frontend (`frontend/`) owns system plugin catalog administration. Wework consumes the catalog for users. Wework still supports skill upload and custom MCP creation, but user upload of Claude Code plugin ZIP packages has been removed.
diff --git a/docs/zh/developer-guide/system-plugin-management.md b/docs/zh/developer-guide/system-plugin-management.md
new file mode 100644
index 0000000000..78df98a80e
--- /dev/null
+++ b/docs/zh/developer-guide/system-plugin-management.md
@@ -0,0 +1,73 @@
+---
+sidebar_position: 33
+---
+
+# 系统插件管理
+
+系统插件管理用于让管理员维护一组面向所有用户展示的插件。每个逻辑插件需要分别维护 ClaudeCode 和 Codex 两个运行时 ZIP 包；用户在 Wework 中只看到一个整合插件，安装或更新时两个运行时版本会一起下发。
+
+## 数据模型
+
+系统插件复用现有 CRD 存储方式：
+
+- 管理员维护的插件使用 `Kind.kind = "Plugin"`，`user_id = 0`，作为系统目录项。
+- 同一个逻辑插件通过 `spec.source.pluginKey` 分组，`spec.runtime = "claudecode"` 或 `"codex"` 标识运行时版本。
+- 用户安装后的插件仍使用 `Kind.kind = "InstalledPlugin"`，归属当前用户。
+- ZIP 包二进制复用 `SkillBinary`，`type = "plugin"`。
+
+系统目录项和用户安装项通过 `spec.source.systemPluginId` 关联。用户安装时复制系统插件的 manifest、组件清单和包引用，不直接共享用户可修改的运行状态。目录接口只展示同时存在且启用的 ClaudeCode 和 Codex 成对版本。
+
+## 管理员能力
+
+管理员入口位于主前端：
+
+```text
+系统管理 -> 插件管理
+```
+
+支持的操作：
+
+- 上传 ZIP 创建或替换系统插件目录项，并选择运行时版本。
+- 修改展示名称和描述。
+- 启用或停用目录项。任一运行时版本停用后，用户目录不再展示该整合插件。
+- 重新上传 ZIP 替换插件包版本。
+- 删除系统插件目录项。
+
+替换 ZIP 时要求新包中的插件名称和原插件一致，避免把用户已安装插件错误更新到另一个插件。
+
+## 用户安装和更新
+
+Wework 的插件管理页只展示系统插件目录，不再提供用户自行上传插件 ZIP 的入口。用户可以：
+
+- 安装系统插件。一次安装会生成 ClaudeCode 和 Codex 两个 `InstalledPlugin`。
+- 启用或停用自己已安装的插件。
+- 当系统插件包被管理员替换后，看到可更新状态。
+- 手动点击更新，将自己的两个安装项同步到系统插件的新包版本。
+
+更新采用用户手动确认策略。管理员替换系统包不会自动修改用户安装项，只会让目录接口返回 `installState = "update_available"`。安装和更新接口返回 `items` 数组，包含两个运行时版本的安装结果。
+
+## API
+
+管理员接口：
+
+```text
+GET    /api/admin/plugins
+POST   /api/admin/plugins
+PUT    /api/admin/plugins/{system_plugin_id}
+PUT    /api/admin/plugins/{system_plugin_id}/package
+DELETE /api/admin/plugins/{system_plugin_id}
+```
+
+用户接口：
+
+```text
+GET  /api/plugins/catalog
+POST /api/plugins/catalog/{system_plugin_id}/install
+POST /api/plugins/catalog/{system_plugin_id}/update
+```
+
+用户安装或更新后会触发全局能力同步，将插件变更同步到在线设备。
+
+## 前端职责
+
+主前端 `frontend/` 负责管理员插件目录维护，Wework 负责用户消费系统插件目录。Wework 仍保留技能上传和自定义 MCP 创建能力，但 Claude Code 插件 ZIP 的用户上传入口已移除。
diff --git a/executor/modes/local/capabilities.py b/executor/modes/local/capabilities.py
index e8b24ea19c..46749151a3 100644
--- a/executor/modes/local/capabilities.py
+++ b/executor/modes/local/capabilities.py
@@ -419,31 +419,41 @@ def reconcile_managed_plugins(self) -> list[str]:
                 runtime = record.get("runtime") or {}
                 if not isinstance(runtime, dict):
                     runtime = {}
-                claude_link_raw = runtime.get("claude_link") or record.get(
-                    "install_path"
-                )
-                if not claude_link_raw:
-                    continue
-                claude_link = Path(str(claude_link_raw)).expanduser()
+                target_runtime = record.get("target_runtime")
+                claude_link_raw = runtime.get("claude_link")
+                if target_runtime != "codex":
+                    claude_link_raw = claude_link_raw or record.get("install_path")
                 if not store_path.is_dir():
                     continue
 
-                if self._ensure_runtime_symlink(
-                    claude_link, store_path, self.plugins_dir
-                ):
-                    restored.append(key)
+                claude_link = None
+                if claude_link_raw:
+                    claude_link = Path(str(claude_link_raw)).expanduser()
+                    if self._ensure_runtime_symlink(
+                        claude_link, store_path, self.plugins_dir
+                    ):
+                        restored.append(key)
 
                 codex_link_raw = runtime.get("codex_link")
                 if codex_link_raw:
                     codex_link = Path(str(codex_link_raw)).expanduser()
-                    self._ensure_runtime_symlink(
-                        codex_link,
-                        store_path,
-                        self.codex_plugins_dir,
-                        optional=True,
-                    )
+                    if (
+                        self._ensure_runtime_symlink(
+                            codex_link,
+                            store_path,
+                            self.codex_plugins_dir,
+                            optional=True,
+                        )
+                        and key not in restored
+                    ):
+                        restored.append(key)
 
-                entry = self._plugin_install_entry(record, claude_link)
+                install_path = claude_link
+                if install_path is None and codex_link_raw:
+                    install_path = Path(str(codex_link_raw)).expanduser()
+                if install_path is None:
+                    continue
+                entry = self._plugin_install_entry(record, install_path)
                 entries = installed_map.get(key)
                 if not isinstance(entries, list):
                     entries = []
@@ -547,9 +557,14 @@ def _sync_local_plugin_marketplace(self, manifest_plugins: dict[str, Any]) -> No
                 continue
             if record.get("marketplace") != "wegent":
                 continue
+            if record.get("target_runtime") == "codex":
+                continue
             store_path = Path(str(record.get("store_path") or "")).expanduser()
             if not store_path.is_dir():
                 continue
+            runtime = record.get("runtime") or {}
+            if isinstance(runtime, dict) and not runtime.get("claude_link"):
+                continue
             plugin_name = record.get("name")
             if not plugin_name:
                 continue
@@ -1257,13 +1272,14 @@ def _sync_plugins(
                 continue
             name = item.get("name")
             marketplace = self._plugin_marketplace(item)
+            runtime = self._plugin_runtime(item)
             if not name:
                 results.append(
                     {"name": None, "status": "failed", "error": "Invalid Plugin entry"}
                 )
                 continue
-            key = self._plugin_key(name, marketplace)
-            runtime_link = self._plugin_runtime_path(item, name, marketplace)
+            key = self._plugin_key(name, marketplace, runtime)
+            runtime_link = self._plugin_runtime_path(item, name, marketplace, runtime)
             store_path = self._plugin_store_path(item, name, marketplace)
             expected_checksum = item.get("checksum")
             should_download = not store_path.exists()
@@ -1315,7 +1331,14 @@ def _sync_plugins(
                 continue
             if store_path != runtime_link:
                 self._ensure_runtime_symlink(runtime_link, store_path)
-            codex_link = self._ensure_codex_plugin_link(key, store_path)
+            codex_link = None
+            if runtime == "all":
+                codex_link = self._ensure_codex_plugin_link(
+                    self._plugin_key(name, marketplace),
+                    store_path,
+                )
+            elif runtime == "codex":
+                codex_link = runtime_link
 
             scope = item.get("scope", "user")
             existing_installs = [
@@ -1337,7 +1360,7 @@ def _sync_plugins(
             )
             installed_map[key] = existing_installs
             records[key] = self._plugin_record(
-                item, key, marketplace, store_path, runtime_link, codex_link
+                item, key, marketplace, store_path, runtime_link, codex_link, runtime
             )
             logger.info(
                 "Configured global plugin: key=%s installed_plugin_id=%s path=%s",
@@ -1469,22 +1492,39 @@ def _plugin_marketplace(self, item: dict[str, Any]) -> str | None:
         marketplace = item.get("marketplace") or source.get("marketplace")
         if marketplace:
             return marketplace
-        if source.get("type") == "upload":
+        if source.get("type") in {"upload", "system"}:
             return "wegent"
         return None
 
-    def _plugin_key(self, name: str, marketplace: str | None) -> str:
-        return f"{name}@{marketplace}" if marketplace else name
+    def _plugin_runtime(self, item: dict[str, Any]) -> str:
+        source = item.get("source") or {}
+        runtime = item.get("runtime") or source.get("runtime")
+        if runtime in {"claudecode", "codex"}:
+            return str(runtime)
+        return "all"
+
+    def _plugin_key(
+        self, name: str, marketplace: str | None, runtime: str | None = None
+    ) -> str:
+        base_key = f"{name}@{marketplace}" if marketplace else name
+        if runtime in {"claudecode", "codex"}:
+            return f"{base_key}#{runtime}"
+        return base_key
 
     def _plugin_runtime_path(
         self,
         item: dict[str, Any],
         name: str,
         marketplace: str | None,
+        runtime: str = "all",
     ) -> Path:
         raw_path = item.get("installPath") or item.get("install_path")
         if raw_path:
             return Path(str(raw_path)).expanduser()
+        if runtime == "codex":
+            return self.codex_plugins_dir / self._safe_path_segment(
+                self._plugin_key(name, marketplace)
+            )
         return (
             self.plugins_dir
             / "cache"
@@ -1551,8 +1591,13 @@ def _plugin_record(
         store_path: Path,
         runtime_link: Path,
         codex_link: Path | None,
+        target_runtime: str,
     ) -> dict[str, Any]:
-        runtime = {"claude_link": str(runtime_link)}
+        runtime: dict[str, str] = {}
+        if target_runtime in {"all", "claudecode"}:
+            runtime["claude_link"] = str(runtime_link)
+        if target_runtime == "codex":
+            runtime["codex_link"] = str(runtime_link)
         if codex_link:
             runtime["codex_link"] = str(codex_link)
         return {
@@ -1569,6 +1614,7 @@ def _plugin_record(
             "components": item.get("components") or {},
             "store_path": str(store_path),
             "runtime": runtime,
+            "target_runtime": target_runtime,
             "install_path": str(runtime_link),
             "managed": True,
             "updated_at": utc_now_iso(),
diff --git a/executor/tests/test_local_capability_sync_handler.py b/executor/tests/test_local_capability_sync_handler.py
index c660ebbd60..a99949e680 100644
--- a/executor/tests/test_local_capability_sync_handler.py
+++ b/executor/tests/test_local_capability_sync_handler.py
@@ -588,6 +588,105 @@ def test_apply_sync_downloads_uploaded_plugin_into_store(tmp_path, monkeypatch):
     )
 
 
+def test_apply_sync_installs_claudecode_and_codex_plugin_variants_separately(
+    tmp_path, monkeypatch
+):
+    skills_dir = tmp_path / "skills"
+    plugins_dir = tmp_path / "plugins"
+    codex_plugins_dir = tmp_path / ".codex" / "plugins"
+    store_dir = tmp_path / "store"
+    manifest_path = tmp_path / "capabilities.json"
+    claudecode_package = create_nested_plugin_zip(
+        "superpowers",
+        "1.0.0",
+        {"commands/claude.md": "# Claude"},
+    )
+    codex_package = create_nested_plugin_zip(
+        "superpowers",
+        "1.0.0",
+        {"commands/codex.md": "# Codex"},
+    )
+    packages = {
+        "/api/plugins/installed/501/download": claudecode_package,
+        "/api/plugins/installed/502/download": codex_package,
+    }
+
+    def fake_get(_self, path: str, **_kwargs):
+        return Response(packages[path])
+
+    monkeypatch.setattr(
+        "executor.modes.local.capabilities.ApiClient.get",
+        fake_get,
+    )
+
+    store = GlobalCapabilityStore(
+        manifest_path=manifest_path,
+        skills_dir=skills_dir,
+        plugins_dir=plugins_dir,
+        codex_plugins_dir=codex_plugins_dir,
+        store_dir=store_dir,
+    )
+    handler = CapabilitySyncHandler(
+        auth_token="token",
+        store=store,
+        skills_dir=skills_dir,
+        plugins_dir=plugins_dir,
+        codex_plugins_dir=codex_plugins_dir,
+    )
+
+    result = handler.apply_sync(
+        {
+            "mode": "replace",
+            "skills": [],
+            "plugins": [
+                {
+                    "installed_plugin_id": 501,
+                    "name": "superpowers",
+                    "version": "1.0.0",
+                    "runtime": "claudecode",
+                    "source": {
+                        "type": "system",
+                        "providerKey": "claude-code",
+                        "pluginKey": "superpowers",
+                        "runtime": "claudecode",
+                    },
+                    "download_path": "/api/plugins/installed/501/download",
+                    "checksum": "sha256:"
+                    + hashlib.sha256(claudecode_package).hexdigest(),
+                },
+                {
+                    "installed_plugin_id": 502,
+                    "name": "superpowers",
+                    "version": "1.0.0",
+                    "runtime": "codex",
+                    "source": {
+                        "type": "system",
+                        "providerKey": "codex",
+                        "pluginKey": "superpowers",
+                        "runtime": "codex",
+                    },
+                    "download_path": "/api/plugins/installed/502/download",
+                    "checksum": "sha256:" + hashlib.sha256(codex_package).hexdigest(),
+                },
+            ],
+            "mcps": [],
+        }
+    )
+
+    assert result["success"] is True
+    claudecode_link = plugins_dir / "cache" / "wegent" / "superpowers" / "1.0.0"
+    codex_link = codex_plugins_dir / "superpowers-wegent"
+    assert (claudecode_link / "commands" / "claude.md").read_text() == "# Claude"
+    assert not (claudecode_link / "commands" / "codex.md").exists()
+    assert (codex_link / "commands" / "codex.md").read_text() == "# Codex"
+    assert not (codex_link / "commands" / "claude.md").exists()
+    manifest = json.loads(manifest_path.read_text())
+    assert set(manifest["plugins"]) == {
+        "superpowers@wegent#claudecode",
+        "superpowers@wegent#codex",
+    }
+
+
 def test_extract_plugin_zip_keeps_existing_install_when_package_is_invalid(tmp_path):
     install_path = tmp_path / "plugins" / "context7"
     install_path.mkdir(parents=True)
diff --git a/frontend/src/__tests__/features/admin/components/SystemPluginList.test.tsx b/frontend/src/__tests__/features/admin/components/SystemPluginList.test.tsx
new file mode 100644
index 0000000000..2773339312
--- /dev/null
+++ b/frontend/src/__tests__/features/admin/components/SystemPluginList.test.tsx
@@ -0,0 +1,199 @@
+// SPDX-FileCopyrightText: 2026 Weibo, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+import '@testing-library/jest-dom'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+
+import { adminApis, AdminSystemPlugin } from '@/apis/admin'
+import SystemPluginList from '@/features/admin/components/SystemPluginList'
+
+const mockToast = jest.fn()
+const mockTranslate = (key: string) => key
+
+jest.mock('@/hooks/use-toast', () => ({
+  useToast: () => ({
+    toast: mockToast,
+  }),
+}))
+
+jest.mock('@/hooks/useTranslation', () => ({
+  useTranslation: () => ({
+    t: mockTranslate,
+  }),
+}))
+
+jest.mock('@/components/ui/dialog', () => ({
+  Dialog: ({
+    open,
+    children,
+  }: {
+    open: boolean
+    onOpenChange?: (open: boolean) => void
+    children: React.ReactNode
+  }) => (open ? <div>{children}</div> : null),
+  DialogContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  DialogDescription: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  DialogFooter: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  DialogHeader: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+}))
+
+jest.mock('@/components/ui/alert-dialog', () => ({
+  AlertDialog: ({
+    open,
+    children,
+  }: {
+    open: boolean
+    onOpenChange?: (open: boolean) => void
+    children: React.ReactNode
+  }) => (open ? <div>{children}</div> : null),
+  AlertDialogAction: ({
+    children,
+    onClick,
+  }: {
+    children: React.ReactNode
+    onClick?: () => void
+  }) => <button onClick={onClick}>{children}</button>,
+  AlertDialogCancel: ({ children }: { children: React.ReactNode }) => <button>{children}</button>,
+  AlertDialogContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  AlertDialogDescription: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  AlertDialogFooter: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  AlertDialogHeader: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  AlertDialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+}))
+
+jest.mock('@/components/ui/switch', () => ({
+  Switch: ({
+    checked,
+    onCheckedChange,
+    ...props
+  }: {
+    checked?: boolean
+    onCheckedChange?: (checked: boolean) => void
+    [key: string]: unknown
+  }) => (
+    <input
+      type="checkbox"
+      checked={checked}
+      onChange={event => onCheckedChange?.(event.target.checked)}
+      {...props}
+    />
+  ),
+}))
+
+jest.mock('@/apis/admin', () => ({
+  adminApis: {
+    getSystemPlugins: jest.fn(),
+    uploadSystemPlugin: jest.fn(),
+    updateSystemPlugin: jest.fn(),
+    replaceSystemPluginPackage: jest.fn(),
+    deleteSystemPlugin: jest.fn(),
+  },
+}))
+
+const mockedAdminApis = adminApis as jest.Mocked<typeof adminApis>
+
+function makePlugin(overrides: Partial<AdminSystemPlugin> = {}): AdminSystemPlugin {
+  return {
+    apiVersion: 'agent.wecode.io/v1',
+    kind: 'Plugin',
+    metadata: { id: 7, name: 'superpowers', namespace: 'system' },
+    spec: {
+      source: {
+        type: 'upload',
+        providerKey: 'claude-code',
+        pluginKey: 'superpowers',
+        runtime: 'claudecode',
+      },
+      displayName: 'Superpowers',
+      description: 'Shared plugin',
+      version: '1.0.0',
+      runtime: 'claudecode',
+      installState: 'installed',
+      enabled: true,
+      componentStates: {},
+      manifest: {},
+      components: {
+        skills: [{ name: 'plan', description: 'Plan work', path: 'skills/plan/SKILL.md' }],
+        commands: [],
+        agents: [],
+        hooks: [],
+        mcps: [],
+        lsps: [],
+        monitors: [],
+        bins: [],
+        settings: null,
+      },
+      packageRef: {
+        storageKey: 'plugins/superpowers.zip',
+        checksum: 'abc',
+        sizeBytes: 2048,
+      },
+      sourcePayload: null,
+    },
+    status: { state: 'Available' },
+    ...overrides,
+  }
+}
+
+describe('SystemPluginList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    mockedAdminApis.getSystemPlugins.mockResolvedValue({
+      total: 1,
+      items: [makePlugin()],
+    })
+    mockedAdminApis.uploadSystemPlugin.mockResolvedValue(makePlugin())
+    mockedAdminApis.updateSystemPlugin.mockResolvedValue(makePlugin())
+    mockedAdminApis.replaceSystemPluginPackage.mockResolvedValue(makePlugin())
+    mockedAdminApis.deleteSystemPlugin.mockResolvedValue(undefined)
+  })
+
+  test('shows system plugins and uploads a new plugin package', async () => {
+    render(<SystemPluginList />)
+
+    expect(await screen.findByText('Superpowers')).toBeInTheDocument()
+    expect(screen.getByText('Shared plugin')).toBeInTheDocument()
+
+    fireEvent.click(screen.getByTestId('system-plugin-upload-button'))
+    fireEvent.change(screen.getByTestId('system-plugin-runtime-select'), {
+      target: { value: 'codex' },
+    })
+    fireEvent.change(screen.getByTestId('system-plugin-file-input'), {
+      target: { files: [new File(['zip'], 'superpowers.zip', { type: 'application/zip' })] },
+    })
+    fireEvent.click(screen.getByTestId('system-plugin-upload-submit'))
+
+    await waitFor(() => {
+      expect(mockedAdminApis.uploadSystemPlugin).toHaveBeenCalledWith(
+        expect.any(File),
+        true,
+        'codex'
+      )
+    })
+  })
+
+  test('updates display metadata and enabled state', async () => {
+    render(<SystemPluginList />)
+
+    await screen.findByText('Superpowers')
+    fireEvent.click(screen.getByTestId('system-plugin-edit-7'))
+    fireEvent.change(screen.getByTestId('system-plugin-display-name-input'), {
+      target: { value: 'Updated Superpowers' },
+    })
+    fireEvent.change(screen.getByTestId('system-plugin-description-input'), {
+      target: { value: 'Updated description' },
+    })
+    fireEvent.click(screen.getByTestId('system-plugin-edit-enabled-switch'))
+    fireEvent.click(screen.getByTestId('system-plugin-edit-submit'))
+
+    await waitFor(() => {
+      expect(mockedAdminApis.updateSystemPlugin).toHaveBeenCalledWith(7, {
+        displayName: 'Updated Superpowers',
+        description: 'Updated description',
+        enabled: false,
+      })
+    })
+  })
+})
diff --git a/frontend/src/apis/admin.ts b/frontend/src/apis/admin.ts
index e870a88790..90ec489690 100644
--- a/frontend/src/apis/admin.ts
+++ b/frontend/src/apis/admin.ts
@@ -3,12 +3,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { apiClient } from './client'
+import { getToken } from './user'
 import {
   getQuickLaunchFunctionsConfig,
   updateQuickLaunchFunctionsConfig,
 } from './admin-quick-launch'
 import { outboundTokenAdminApis } from './outboundTokens'
 import { RetrieverCRD } from './retrievers'
+import { getApiBaseUrl } from '@/lib/runtime-config'
 import type { SkillRefMeta } from '@/types/api'
 
 // Re-export RetrieverCRD for backward compatibility
@@ -574,6 +576,124 @@ export interface AdminTemplateUpdate {
   resources?: TemplateResources
 }
 
+export type PluginInstallState =
+  | 'not_installed'
+  | 'installed'
+  | 'update_available'
+  | 'unavailable'
+  | 'failed'
+  | 'uninstalled'
+
+export type PluginRuntime = 'claudecode' | 'codex'
+
+export interface AdminPluginPathComponent {
+  name: string
+  path: string
+}
+
+export interface AdminPluginSkillComponent extends AdminPluginPathComponent {
+  description: string
+}
+
+export interface AdminPluginMCPComponent {
+  name: string
+  server: Record<string, unknown>
+}
+
+export interface AdminPluginComponents {
+  skills: AdminPluginSkillComponent[]
+  commands: AdminPluginPathComponent[]
+  agents: AdminPluginPathComponent[]
+  hooks: AdminPluginPathComponent[]
+  mcps: AdminPluginMCPComponent[]
+  lsps: AdminPluginPathComponent[]
+  monitors: AdminPluginPathComponent[]
+  bins: AdminPluginPathComponent[]
+  settings?: Record<string, unknown> | null
+}
+
+export interface AdminPluginPackageRef {
+  storageKey: string
+  checksum: string
+  sizeBytes: number
+}
+
+export interface AdminSystemPlugin {
+  apiVersion: string
+  kind: 'Plugin'
+  metadata: Record<string, unknown>
+  spec: {
+    source: {
+      type: 'upload' | 'marketplace' | 'local' | 'system'
+      providerKey: string
+      pluginKey: string
+      catalogItemId?: string | null
+      marketplace?: string | null
+      systemPluginId?: number | null
+      runtime?: PluginRuntime | null
+    }
+    displayName: string
+    description: string
+    version?: string | null
+    author?: string | null
+    runtime: PluginRuntime
+    installState: PluginInstallState
+    enabled: boolean
+    componentStates?: Record<string, boolean>
+    manifest: Record<string, unknown>
+    components: AdminPluginComponents
+    packageRef?: AdminPluginPackageRef | null
+    sourcePayload?: Record<string, unknown> | null
+  }
+  status: {
+    state: string
+  }
+}
+
+export interface AdminSystemPluginListResponse {
+  total: number
+  items: AdminSystemPlugin[]
+}
+
+export interface AdminSystemPluginUpdate {
+  displayName?: string
+  description?: string
+  enabled?: boolean
+}
+
+async function uploadSystemPluginForm(
+  endpoint: string,
+  formData: FormData,
+  method: 'POST' | 'PUT'
+): Promise<AdminSystemPlugin> {
+  const token = getToken()
+  if (!token) {
+    throw new Error('No authentication token')
+  }
+
+  const response = await fetch(`${getApiBaseUrl()}${endpoint}`, {
+    method,
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+    body: formData,
+  })
+
+  if (!response.ok) {
+    const errorText = await response.text()
+    let message = errorText
+    try {
+      const error = JSON.parse(errorText)
+      message = typeof error.detail === 'string' ? error.detail : errorText
+    } catch {
+      message = errorText
+    }
+    throw new Error(message || 'Failed to upload system plugin')
+  }
+
+  return response.json()
+}
+
 // Admin API Services
 export const adminApis = {
   ...outboundTokenAdminApis,
@@ -688,6 +808,41 @@ export const adminApis = {
     return apiClient.delete(`/admin/public-models/${modelId}`)
   },
 
+  // ==================== System Plugin Management ====================
+
+  async getSystemPlugins(): Promise<AdminSystemPluginListResponse> {
+    return apiClient.get('/admin/plugins')
+  },
+
+  async uploadSystemPlugin(
+    file: File,
+    enabled: boolean = true,
+    runtime: PluginRuntime = 'claudecode'
+  ): Promise<AdminSystemPlugin> {
+    const formData = new FormData()
+    formData.append('file', file)
+    formData.append('enabled', String(enabled))
+    formData.append('runtime', runtime)
+    return uploadSystemPluginForm('/admin/plugins', formData, 'POST')
+  },
+
+  async updateSystemPlugin(
+    pluginId: number,
+    pluginData: AdminSystemPluginUpdate
+  ): Promise<AdminSystemPlugin> {
+    return apiClient.put(`/admin/plugins/${pluginId}`, pluginData)
+  },
+
+  async replaceSystemPluginPackage(pluginId: number, file: File): Promise<AdminSystemPlugin> {
+    const formData = new FormData()
+    formData.append('file', file)
+    return uploadSystemPluginForm(`/admin/plugins/${pluginId}/package`, formData, 'PUT')
+  },
+
+  async deleteSystemPlugin(pluginId: number): Promise<void> {
+    return apiClient.delete(`/admin/plugins/${pluginId}`)
+  },
+
   // ==================== System Stats ====================
 
   /**
diff --git a/frontend/src/app/admin/page.tsx b/frontend/src/app/admin/page.tsx
index 0abf161d04..a158a331e4 100644
--- a/frontend/src/app/admin/page.tsx
+++ b/frontend/src/app/admin/page.tsx
@@ -37,6 +37,9 @@ const PublicRetrieverList = dynamic(
 const PublicSkillList = dynamic(() => import('@/features/admin/components/PublicSkillList'), {
   ssr: false,
 })
+const SystemPluginList = dynamic(() => import('@/features/admin/components/SystemPluginList'), {
+  ssr: false,
+})
 const PublicGhostList = dynamic(() => import('@/features/admin/components/PublicGhostList'), {
   ssr: false,
 })
@@ -110,6 +113,7 @@ function AdminContent() {
         'public-models',
         'public-retrievers',
         'public-skills',
+        'plugins',
         'public-ghosts',
         'public-shells',
         'public-teams',
@@ -171,6 +175,8 @@ function AdminContent() {
         return <PublicRetrieverList />
       case 'public-skills':
         return <PublicSkillList />
+      case 'plugins':
+        return <SystemPluginList />
       case 'public-ghosts':
         return <PublicGhostList />
       case 'public-shells':
diff --git a/frontend/src/features/admin/components/AdminTabNav.tsx b/frontend/src/features/admin/components/AdminTabNav.tsx
index df7a7fce64..5e6c6c338d 100644
--- a/frontend/src/features/admin/components/AdminTabNav.tsx
+++ b/frontend/src/features/admin/components/AdminTabNav.tsx
@@ -30,6 +30,7 @@ import {
   MessageSquare,
   Monitor,
   LayoutTemplate,
+  Boxes,
 } from 'lucide-react'
 
 export type AdminTabId =
@@ -37,6 +38,7 @@ export type AdminTabId =
   | 'public-models'
   | 'public-retrievers'
   | 'public-skills'
+  | 'plugins'
   | 'public-ghosts'
   | 'public-shells'
   | 'public-teams'
@@ -73,6 +75,7 @@ export function AdminTabNav({ activeTab, onTabChange }: AdminTabNavProps) {
     { id: 'public-models', label: t('admin:tabs.public_models'), icon: Cpu },
     { id: 'public-retrievers', label: t('admin:tabs.public_retrievers'), icon: Database },
     { id: 'public-skills', label: t('admin:tabs.public_skills'), icon: Sparkles },
+    { id: 'plugins', label: t('admin:tabs.plugins'), icon: Boxes },
     { id: 'public-ghosts', label: t('admin:tabs.public_ghosts'), icon: Ghost },
     { id: 'public-shells', label: t('admin:tabs.public_shells'), icon: Terminal },
     { id: 'public-teams', label: t('admin:tabs.public_teams'), icon: UsersRound },
diff --git a/frontend/src/features/admin/components/SystemPluginList.tsx b/frontend/src/features/admin/components/SystemPluginList.tsx
new file mode 100644
index 0000000000..9dd405640c
--- /dev/null
+++ b/frontend/src/features/admin/components/SystemPluginList.tsx
@@ -0,0 +1,591 @@
+// SPDX-FileCopyrightText: 2026 Weibo, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+'use client'
+
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Switch } from '@/components/ui/switch'
+import { Tag } from '@/components/ui/tag'
+import { Textarea } from '@/components/ui/textarea'
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/hooks/useTranslation'
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/components/ui/alert-dialog'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import UnifiedAddButton from '@/components/common/UnifiedAddButton'
+import { adminApis, type AdminSystemPlugin, type PluginRuntime } from '@/apis/admin'
+import { Boxes, Loader2, PackageCheck, Pencil, RefreshCw, Trash2 } from 'lucide-react'
+
+type PluginFormData = {
+  displayName: string
+  description: string
+  enabled: boolean
+  runtime: PluginRuntime
+}
+
+function metadataId(plugin: AdminSystemPlugin): number {
+  const rawId = plugin.metadata.id
+  return typeof rawId === 'number' ? rawId : Number(rawId)
+}
+
+function pluginName(plugin: AdminSystemPlugin): string {
+  const rawName = plugin.metadata.name
+  return typeof rawName === 'string' ? rawName : String(rawName || '')
+}
+
+function componentCount(plugin: AdminSystemPlugin): number {
+  const components = plugin.spec.components
+  return (
+    components.skills.length +
+    components.commands.length +
+    components.agents.length +
+    components.hooks.length +
+    components.mcps.length +
+    components.lsps.length +
+    components.monitors.length +
+    components.bins.length
+  )
+}
+
+const SystemPluginList: React.FC = () => {
+  const { t } = useTranslation('admin')
+  const { toast } = useToast()
+  const [plugins, setPlugins] = useState<AdminSystemPlugin[]>([])
+  const [loading, setLoading] = useState(true)
+  const [saving, setSaving] = useState(false)
+  const [selectedPlugin, setSelectedPlugin] = useState<AdminSystemPlugin | null>(null)
+  const [isUploadDialogOpen, setIsUploadDialogOpen] = useState(false)
+  const [isEditDialogOpen, setIsEditDialogOpen] = useState(false)
+  const [isReplaceDialogOpen, setIsReplaceDialogOpen] = useState(false)
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
+  const [selectedFile, setSelectedFile] = useState<File | null>(null)
+  const [formData, setFormData] = useState<PluginFormData>({
+    displayName: '',
+    description: '',
+    enabled: true,
+    runtime: 'claudecode',
+  })
+
+  const fetchPlugins = useCallback(async () => {
+    setLoading(true)
+    try {
+      const response = await adminApis.getSystemPlugins()
+      setPlugins(response.items)
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.load_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setLoading(false)
+    }
+  }, [t, toast])
+
+  useEffect(() => {
+    fetchPlugins()
+  }, [fetchPlugins])
+
+  const selectedPluginId = useMemo(() => {
+    return selectedPlugin ? metadataId(selectedPlugin) : null
+  }, [selectedPlugin])
+
+  const resetUploadForm = () => {
+    setSelectedFile(null)
+    setFormData({
+      displayName: '',
+      description: '',
+      enabled: true,
+      runtime: 'claudecode',
+    })
+  }
+
+  const openEditDialog = (plugin: AdminSystemPlugin) => {
+    setSelectedPlugin(plugin)
+    setFormData({
+      displayName: plugin.spec.displayName,
+      description: plugin.spec.description,
+      enabled: plugin.spec.enabled,
+      runtime: plugin.spec.runtime,
+    })
+    setIsEditDialogOpen(true)
+  }
+
+  const openReplaceDialog = (plugin: AdminSystemPlugin) => {
+    setSelectedPlugin(plugin)
+    setSelectedFile(null)
+    setIsReplaceDialogOpen(true)
+  }
+
+  const handleUpload = async () => {
+    if (!selectedFile) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.file_required'),
+      })
+      return
+    }
+
+    setSaving(true)
+    try {
+      await adminApis.uploadSystemPlugin(selectedFile, formData.enabled, formData.runtime)
+      toast({ title: t('system_plugins.success.uploaded') })
+      setIsUploadDialogOpen(false)
+      resetUploadForm()
+      fetchPlugins()
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.upload_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleUpdateMetadata = async () => {
+    if (!selectedPlugin || selectedPluginId === null) return
+
+    setSaving(true)
+    try {
+      await adminApis.updateSystemPlugin(selectedPluginId, {
+        displayName: formData.displayName.trim(),
+        description: formData.description.trim(),
+        enabled: formData.enabled,
+      })
+      toast({ title: t('system_plugins.success.updated') })
+      setIsEditDialogOpen(false)
+      setSelectedPlugin(null)
+      fetchPlugins()
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.update_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleToggleEnabled = async (plugin: AdminSystemPlugin, enabled: boolean) => {
+    const pluginId = metadataId(plugin)
+    setSaving(true)
+    try {
+      await adminApis.updateSystemPlugin(pluginId, { enabled })
+      toast({ title: t('system_plugins.success.updated') })
+      fetchPlugins()
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.update_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleReplacePackage = async () => {
+    if (!selectedPlugin || selectedPluginId === null || !selectedFile) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.file_required'),
+      })
+      return
+    }
+
+    setSaving(true)
+    try {
+      await adminApis.replaceSystemPluginPackage(selectedPluginId, selectedFile)
+      toast({ title: t('system_plugins.success.replaced') })
+      setIsReplaceDialogOpen(false)
+      setSelectedPlugin(null)
+      setSelectedFile(null)
+      fetchPlugins()
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.replace_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleDelete = async () => {
+    if (!selectedPlugin || selectedPluginId === null) return
+
+    setSaving(true)
+    try {
+      await adminApis.deleteSystemPlugin(selectedPluginId)
+      toast({ title: t('system_plugins.success.deleted') })
+      setIsDeleteDialogOpen(false)
+      setSelectedPlugin(null)
+      fetchPlugins()
+    } catch (error) {
+      toast({
+        variant: 'destructive',
+        title: t('system_plugins.errors.delete_failed'),
+        description: (error as Error).message,
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  return (
+    <div className="space-y-3">
+      <div>
+        <h2 className="text-xl font-semibold text-text-primary mb-1">
+          {t('system_plugins.title')}
+        </h2>
+        <p className="text-sm text-text-muted">{t('system_plugins.description')}</p>
+      </div>
+
+      <div className="bg-base border border-border rounded-md p-2 w-full max-h-[70vh] flex flex-col overflow-y-auto">
+        {loading && (
+          <div className="flex items-center justify-center py-12">
+            <Loader2 className="w-6 h-6 animate-spin text-text-muted" />
+          </div>
+        )}
+
+        {!loading && plugins.length === 0 && (
+          <div className="flex flex-col items-center justify-center py-12 text-center">
+            <Boxes className="w-12 h-12 text-text-muted mb-4" />
+            <p className="text-text-muted">{t('system_plugins.no_plugins')}</p>
+          </div>
+        )}
+
+        {!loading && plugins.length > 0 && (
+          <div className="flex-1 overflow-y-auto space-y-3 p-1">
+            {plugins.map(plugin => {
+              const pluginId = metadataId(plugin)
+              return (
+                <Card
+                  key={pluginId}
+                  className="p-4 bg-base hover:bg-hover transition-colors border-l-2 border-l-primary"
+                >
+                  <div className="flex items-start justify-between gap-3 min-w-0">
+                    <div className="flex items-start gap-3 min-w-0 flex-1">
+                      <PackageCheck className="w-5 h-5 text-primary flex-shrink-0 mt-0.5" />
+                      <div className="min-w-0 flex-1">
+                        <div className="flex items-center gap-2 min-w-0 flex-wrap">
+                          <h3 className="text-base font-medium text-text-primary truncate">
+                            {plugin.spec.displayName || pluginName(plugin)}
+                          </h3>
+                          {plugin.spec.enabled ? (
+                            <Tag variant="success">{t('system_plugins.status.enabled')}</Tag>
+                          ) : (
+                            <Tag variant="error">{t('system_plugins.status.disabled')}</Tag>
+                          )}
+                          <Tag variant="info">
+                            {t(`system_plugins.runtime.${plugin.spec.runtime}`)}
+                          </Tag>
+                          {plugin.spec.version && (
+                            <Tag variant="info">
+                              {t('system_plugins.version', { version: plugin.spec.version })}
+                            </Tag>
+                          )}
+                        </div>
+                        <p className="mt-1 text-sm text-text-secondary line-clamp-2">
+                          {plugin.spec.description || t('system_plugins.no_description')}
+                        </p>
+                        <div className="flex flex-wrap items-center gap-2 mt-2 text-xs text-text-muted">
+                          <span>
+                            {t('system_plugins.fields.name')}: {pluginName(plugin)}
+                          </span>
+                          <span>*</span>
+                          <span>
+                            {t('system_plugins.fields.components')}: {componentCount(plugin)}
+                          </span>
+                          {plugin.spec.packageRef && (
+                            <>
+                              <span>*</span>
+                              <span>
+                                {t('system_plugins.fields.package_size')}:{' '}
+                                {Math.ceil(plugin.spec.packageRef.sizeBytes / 1024)} KB
+                              </span>
+                            </>
+                          )}
+                        </div>
+                      </div>
+                    </div>
+                    <div className="flex items-center gap-1 flex-shrink-0">
+                      <Switch
+                        checked={plugin.spec.enabled}
+                        disabled={saving}
+                        onCheckedChange={checked => handleToggleEnabled(plugin, checked)}
+                        aria-label={t('system_plugins.actions.toggle')}
+                        data-testid={`system-plugin-enabled-${pluginId}`}
+                      />
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8"
+                        onClick={() => openEditDialog(plugin)}
+                        title={t('system_plugins.actions.edit')}
+                        data-testid={`system-plugin-edit-${pluginId}`}
+                      >
+                        <Pencil className="w-4 h-4" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8"
+                        onClick={() => openReplaceDialog(plugin)}
+                        title={t('system_plugins.actions.replace_package')}
+                        data-testid={`system-plugin-replace-${pluginId}`}
+                      >
+                        <RefreshCw className="w-4 h-4" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8 hover:text-error"
+                        onClick={() => {
+                          setSelectedPlugin(plugin)
+                          setIsDeleteDialogOpen(true)
+                        }}
+                        title={t('system_plugins.actions.delete')}
+                        data-testid={`system-plugin-delete-${pluginId}`}
+                      >
+                        <Trash2 className="w-4 h-4" />
+                      </Button>
+                    </div>
+                  </div>
+                </Card>
+              )
+            })}
+          </div>
+        )}
+
+        {!loading && (
+          <div className="border-t border-border pt-3 mt-3 bg-base">
+            <div className="flex justify-center">
+              <UnifiedAddButton
+                onClick={() => {
+                  resetUploadForm()
+                  setIsUploadDialogOpen(true)
+                }}
+                data-testid="system-plugin-upload-button"
+              >
+                {t('system_plugins.actions.upload')}
+              </UnifiedAddButton>
+            </div>
+          </div>
+        )}
+      </div>
+
+      <Dialog open={isUploadDialogOpen} onOpenChange={setIsUploadDialogOpen}>
+        <DialogContent className="max-w-lg">
+          <DialogHeader>
+            <DialogTitle>{t('system_plugins.upload.title')}</DialogTitle>
+            <DialogDescription>{t('system_plugins.upload.description')}</DialogDescription>
+          </DialogHeader>
+          <div className="space-y-4 py-4">
+            <div className="space-y-2">
+              <Label htmlFor="system-plugin-file">{t('system_plugins.fields.zip_file')} *</Label>
+              <Input
+                id="system-plugin-file"
+                type="file"
+                accept=".zip,application/zip"
+                onChange={event => setSelectedFile(event.target.files?.[0] || null)}
+                data-testid="system-plugin-file-input"
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="system-plugin-runtime">{t('system_plugins.fields.runtime')}</Label>
+              <select
+                id="system-plugin-runtime"
+                value={formData.runtime}
+                onChange={event =>
+                  setFormData(prev => ({
+                    ...prev,
+                    runtime: event.target.value as PluginRuntime,
+                  }))
+                }
+                className="h-10 w-full rounded-md border border-border bg-base px-3 text-sm text-text-primary"
+                data-testid="system-plugin-runtime-select"
+              >
+                <option value="claudecode">{t('system_plugins.runtime.claudecode')}</option>
+                <option value="codex">{t('system_plugins.runtime.codex')}</option>
+              </select>
+            </div>
+            <div className="flex items-center justify-between">
+              <Label htmlFor="system-plugin-enabled">{t('system_plugins.fields.enabled')}</Label>
+              <Switch
+                id="system-plugin-enabled"
+                checked={formData.enabled}
+                onCheckedChange={checked => setFormData(prev => ({ ...prev, enabled: checked }))}
+                data-testid="system-plugin-upload-enabled-switch"
+              />
+            </div>
+          </div>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsUploadDialogOpen(false)}>
+              {t('common.cancel')}
+            </Button>
+            <Button
+              variant="primary"
+              onClick={handleUpload}
+              disabled={saving}
+              data-testid="system-plugin-upload-submit"
+            >
+              {saving && <Loader2 className="w-4 h-4 animate-spin" />}
+              {t('system_plugins.actions.upload')}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={isEditDialogOpen} onOpenChange={setIsEditDialogOpen}>
+        <DialogContent className="max-w-lg">
+          <DialogHeader>
+            <DialogTitle>{t('system_plugins.edit.title')}</DialogTitle>
+          </DialogHeader>
+          <div className="space-y-4 py-4">
+            <div className="space-y-2">
+              <Label htmlFor="system-plugin-display-name">
+                {t('system_plugins.fields.display_name')}
+              </Label>
+              <Input
+                id="system-plugin-display-name"
+                value={formData.displayName}
+                onChange={event =>
+                  setFormData(prev => ({ ...prev, displayName: event.target.value }))
+                }
+                data-testid="system-plugin-display-name-input"
+              />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="system-plugin-description">
+                {t('system_plugins.fields.description')}
+              </Label>
+              <Textarea
+                id="system-plugin-description"
+                value={formData.description}
+                onChange={event =>
+                  setFormData(prev => ({ ...prev, description: event.target.value }))
+                }
+                className="min-h-[120px]"
+                data-testid="system-plugin-description-input"
+              />
+            </div>
+            <div className="flex items-center justify-between">
+              <Label htmlFor="system-plugin-edit-enabled">
+                {t('system_plugins.fields.enabled')}
+              </Label>
+              <Switch
+                id="system-plugin-edit-enabled"
+                checked={formData.enabled}
+                onCheckedChange={checked => setFormData(prev => ({ ...prev, enabled: checked }))}
+                data-testid="system-plugin-edit-enabled-switch"
+              />
+            </div>
+          </div>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsEditDialogOpen(false)}>
+              {t('common.cancel')}
+            </Button>
+            <Button
+              variant="primary"
+              onClick={handleUpdateMetadata}
+              disabled={saving}
+              data-testid="system-plugin-edit-submit"
+            >
+              {saving && <Loader2 className="w-4 h-4 animate-spin" />}
+              {t('common.save')}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={isReplaceDialogOpen} onOpenChange={setIsReplaceDialogOpen}>
+        <DialogContent className="max-w-lg">
+          <DialogHeader>
+            <DialogTitle>{t('system_plugins.replace.title')}</DialogTitle>
+            <DialogDescription>
+              {t('system_plugins.replace.description', {
+                name: selectedPlugin
+                  ? selectedPlugin.spec.displayName || pluginName(selectedPlugin)
+                  : '',
+              })}
+            </DialogDescription>
+          </DialogHeader>
+          <div className="space-y-2 py-4">
+            <Label htmlFor="system-plugin-replace-file">
+              {t('system_plugins.fields.zip_file')} *
+            </Label>
+            <Input
+              id="system-plugin-replace-file"
+              type="file"
+              accept=".zip,application/zip"
+              onChange={event => setSelectedFile(event.target.files?.[0] || null)}
+              data-testid="system-plugin-replace-file-input"
+            />
+          </div>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setIsReplaceDialogOpen(false)}>
+              {t('common.cancel')}
+            </Button>
+            <Button
+              variant="primary"
+              onClick={handleReplacePackage}
+              disabled={saving}
+              data-testid="system-plugin-replace-submit"
+            >
+              {saving && <Loader2 className="w-4 h-4 animate-spin" />}
+              {t('system_plugins.actions.replace_package')}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      <AlertDialog open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>{t('system_plugins.delete.title')}</AlertDialogTitle>
+            <AlertDialogDescription>
+              {t('system_plugins.delete.description', {
+                name: selectedPlugin
+                  ? selectedPlugin.spec.displayName || pluginName(selectedPlugin)
+                  : '',
+              })}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
+            <AlertDialogAction onClick={handleDelete} className="bg-error hover:bg-error/90">
+              {t('common.delete')}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  )
+}
+
+export default SystemPluginList
diff --git a/frontend/src/i18n/locales/en/admin.json b/frontend/src/i18n/locales/en/admin.json
index f68bc0e084..c3c2fe214f 100644
--- a/frontend/src/i18n/locales/en/admin.json
+++ b/frontend/src/i18n/locales/en/admin.json
@@ -6,6 +6,7 @@
     "public_models": "Public Models",
     "public_retrievers": "Public Retrievers",
     "public_skills": "Public Skills",
+    "plugins": "Plugins",
     "public_teams": "Public Agents",
     "public_bots": "Public Bots",
     "public_ghosts": "Public Ghosts",
@@ -33,6 +34,67 @@
     "loading": "Loading...",
     "done": "Done"
   },
+  "system_plugins": {
+    "title": "Plugin Management",
+    "description": "Manage the plugins shown to users by default, including uploads, display metadata, enabled state, and ZIP package replacements",
+    "no_plugins": "No system plugins yet",
+    "no_description": "No description",
+    "version": "Version {{version}}",
+    "runtime": {
+      "claudecode": "ClaudeCode",
+      "codex": "Codex"
+    },
+    "status": {
+      "enabled": "Enabled",
+      "disabled": "Disabled"
+    },
+    "fields": {
+      "name": "Plugin name",
+      "components": "Components",
+      "package_size": "Package size",
+      "zip_file": "ZIP file",
+      "enabled": "Enabled",
+      "display_name": "Display name",
+      "description": "Description",
+      "runtime": "Runtime version"
+    },
+    "actions": {
+      "upload": "Upload plugin",
+      "toggle": "Toggle enabled state",
+      "edit": "Edit display metadata",
+      "replace_package": "Replace ZIP",
+      "delete": "Delete plugin"
+    },
+    "upload": {
+      "title": "Upload System Plugin",
+      "description": "After uploading both ClaudeCode and Codex runtime ZIPs, users can see one combined plugin in wework plugin management and add it manually."
+    },
+    "edit": {
+      "title": "Edit Plugin Display Metadata"
+    },
+    "replace": {
+      "title": "Replace Plugin Package",
+      "description": "Upload a new ZIP to replace {{name}}. Installed users will see an update prompt and update manually."
+    },
+    "delete": {
+      "title": "Delete Plugin",
+      "description": "Delete {{name}}? The plugin will no longer be shown to users."
+    },
+    "success": {
+      "uploaded": "Plugin uploaded",
+      "updated": "Plugin updated",
+      "replaced": "Plugin package replaced",
+      "deleted": "Plugin deleted"
+    },
+    "errors": {
+      "load_failed": "Failed to load plugins",
+      "file_required": "Select a ZIP file",
+      "upload_failed": "Failed to upload plugin",
+      "update_failed": "Failed to update plugin",
+      "replace_failed": "Failed to replace plugin package",
+      "delete_failed": "Failed to delete plugin"
+    }
+  },
   "users": {
     "title": "User Management",
     "description": "Create, edit, and manage user accounts",
diff --git a/frontend/src/i18n/locales/zh-CN/admin.json b/frontend/src/i18n/locales/zh-CN/admin.json
index dc8c33e19d..cce46c5f9b 100644
--- a/frontend/src/i18n/locales/zh-CN/admin.json
+++ b/frontend/src/i18n/locales/zh-CN/admin.json
@@ -6,6 +6,7 @@
     "public_models": "公共模型",
     "public_retrievers": "公共检索引擎",
     "public_skills": "公共技能",
+    "plugins": "插件管理",
     "public_teams": "公共智能体",
     "public_bots": "公共机器人",
     "public_ghosts": "公共 Ghost",
@@ -33,6 +34,67 @@
     "loading": "加载中...",
     "done": "完成"
   },
+  "system_plugins": {
+    "title": "插件管理",
+    "description": "管理系统默认展示给用户的插件，支持上传、修改展示信息、启停和替换 ZIP 版本",
+    "no_plugins": "暂无系统插件",
+    "no_description": "暂无描述",
+    "version": "版本 {{version}}",
+    "runtime": {
+      "claudecode": "ClaudeCode",
+      "codex": "Codex"
+    },
+    "status": {
+      "enabled": "已启用",
+      "disabled": "已停用"
+    },
+    "fields": {
+      "name": "插件名称",
+      "components": "组件数",
+      "package_size": "包大小",
+      "zip_file": "ZIP 文件",
+      "enabled": "启用",
+      "display_name": "展示名称",
+      "description": "描述",
+      "runtime": "运行时版本"
+    },
+    "actions": {
+      "upload": "上传插件",
+      "toggle": "切换启停状态",
+      "edit": "编辑展示信息",
+      "replace_package": "替换 ZIP",
+      "delete": "删除插件"
+    },
+    "upload": {
+      "title": "上传系统插件",
+      "description": "分别上传 ClaudeCode 和 Codex 两个运行时版本后，用户可在 wework 插件管理中看到一个整合插件并手动添加。"
+    },
+    "edit": {
+      "title": "编辑插件展示信息"
+    },
+    "replace": {
+      "title": "替换插件包",
+      "description": "上传新的 ZIP 替换 {{name}}。已安装用户会看到可更新提示，并需要手动更新。"
+    },
+    "delete": {
+      "title": "删除插件",
+      "description": "确定要删除 {{name}} 吗？删除后该插件不会继续展示给用户。"
+    },
+    "success": {
+      "uploaded": "插件已上传",
+      "updated": "插件已更新",
+      "replaced": "插件包已替换",
+      "deleted": "插件已删除"
+    },
+    "errors": {
+      "load_failed": "加载插件失败",
+      "file_required": "请选择 ZIP 文件",
+      "upload_failed": "上传插件失败",
+      "update_failed": "更新插件失败",
+      "replace_failed": "替换插件包失败",
+      "delete_failed": "删除插件失败"
+    }
+  },
   "users": {
     "title": "用户管理",
     "description": "创建、编辑和管理用户账号",
diff --git a/wework/src/api/adapters.test.ts b/wework/src/api/adapters.test.ts
index 41190f80a5..1de87698fc 100644
--- a/wework/src/api/adapters.test.ts
+++ b/wework/src/api/adapters.test.ts
@@ -5,7 +5,6 @@ import { createSystemSkillApi } from './systemSkills'
 import { createTeamApi } from './teams'
 import { createModelApi } from './models'
 import { createSkillApi } from './skills'
-import { createPluginApi } from './plugins'
 import type { HttpClient } from './http'
 
 function mockClient(): HttpClient {
@@ -207,19 +206,6 @@ describe('REST adapters', () => {
     expect(client.get).toHaveBeenNthCalledWith(2, '/teams/2/skills')
   })
 
-  test('uploads plugins through the shared http client', async () => {
-    const client = mockClient()
-    vi.mocked(client.post).mockResolvedValueOnce({ metadata: { labels: { id: '1' } } })
-    const file = new File(['zip'], 'plugin.ZIP')
-
-    await createPluginApi(client).uploadPlugin(file, false)
-
-    expect(client.post).toHaveBeenCalledWith('/plugins/upload', expect.any(FormData))
-    const formData = vi.mocked(client.post).mock.calls[0][1] as FormData
-    expect(formData.get('file')).toBe(file)
-    expect(formData.get('enabled')).toBe('false')
-  })
-
   test('starts project-scoped terminal and IDE sessions', async () => {
     const client = mockClient()
     vi.mocked(client.post).mockResolvedValue({ url: 'http://localhost/session' })
diff --git a/wework/src/api/plugins.ts b/wework/src/api/plugins.ts
index 66cb10744b..5c7f4d6b5d 100644
--- a/wework/src/api/plugins.ts
+++ b/wework/src/api/plugins.ts
@@ -2,6 +2,7 @@ import type {
   InstalledPlugin,
   InstalledPluginListResponse,
   InstalledPluginUpdateRequest,
+  PluginCatalogListResponse,
 } from '@/types/api'
 import type { HttpClient } from './http'
 
@@ -10,20 +11,23 @@ export function createPluginApi(client: HttpClient) {
     listInstalledPlugins(): Promise<InstalledPluginListResponse> {
       return client.get('/plugins/installed')
     },
+    listPluginCatalog(): Promise<PluginCatalogListResponse> {
+      return client.get('/plugins/catalog')
+    },
+    installSystemPlugin(id: number): Promise<InstalledPluginListResponse> {
+      return client.post(`/plugins/catalog/${id}/install`)
+    },
+    updateSystemPlugin(id: number): Promise<InstalledPluginListResponse> {
+      return client.post(`/plugins/catalog/${id}/update`)
+    },
     updateInstalledPlugin(
       id: number,
-      data: InstalledPluginUpdateRequest,
+      data: InstalledPluginUpdateRequest
     ): Promise<InstalledPlugin> {
       return client.put(`/plugins/installed/${id}`, data)
     },
     uninstallInstalledPlugin(id: number): Promise<void> {
       return client.delete(`/plugins/installed/${id}`)
     },
-    uploadPlugin(file: File, enabled = true): Promise<InstalledPlugin> {
-      const formData = new FormData()
-      formData.append('file', file)
-      formData.append('enabled', String(enabled))
-      return client.post('/plugins/upload', formData)
-    },
   }
 }
diff --git a/wework/src/components/plugins/PluginCreateMenu.tsx b/wework/src/components/plugins/PluginCreateMenu.tsx
index 448d62dd4f..3aabb76aae 100644
--- a/wework/src/components/plugins/PluginCreateMenu.tsx
+++ b/wework/src/components/plugins/PluginCreateMenu.tsx
@@ -1,4 +1,4 @@
-import { Boxes, ChevronDown, Plus, Server, Sparkles } from 'lucide-react'
+import { ChevronDown, Plus, Server, Sparkles } from 'lucide-react'
 import { useEffect, useRef } from 'react'
 import { useTranslation } from '@/hooks/useTranslation'
 import { cn } from '@/lib/utils'
@@ -8,7 +8,6 @@ export function PluginCreateMenu({
   onToggle,
   onCreateSkill,
   onCreateMcp,
-  onCreatePlugin,
   buttonTestId = 'plugins-create-button',
   compact = false,
 }: {
@@ -16,7 +15,6 @@ export function PluginCreateMenu({
   onToggle: () => void
   onCreateSkill: () => void
   onCreateMcp: () => void
-  onCreatePlugin?: () => void
   buttonTestId?: string
   compact?: boolean
 }) {
@@ -53,7 +51,7 @@ export function PluginCreateMenu({
           'flex min-w-[44px] items-center justify-center text-text-primary transition-colors',
           compact
             ? 'h-11 w-11 gap-0 rounded-xl bg-surface px-0 text-sm font-semibold hover:bg-muted'
-            : 'h-7 gap-1.5 rounded-lg bg-transparent px-2 text-[13px] font-medium leading-[18px] hover:bg-black/[0.06] active:bg-black/[0.10]',
+            : 'h-7 gap-1.5 rounded-lg bg-transparent px-2 text-[13px] font-medium leading-[18px] hover:bg-black/[0.06] active:bg-black/[0.10]'
         )}
         onClick={onToggle}
       >
@@ -89,17 +87,6 @@ export function PluginCreateMenu({
             <Server className="h-4 w-4 text-primary" />
             {t('workbench.plugins_create_mcp', 'MCP')}
           </button>
-          {onCreatePlugin && (
-            <button
-              type="button"
-              data-testid="plugins-create-plugin-option"
-              className="flex h-11 w-full items-center gap-2 rounded-lg px-3 text-left text-sm font-semibold text-text-primary hover:bg-surface"
-              onClick={onCreatePlugin}
-            >
-              <Boxes className="h-4 w-4 text-violet-500" />
-              {t('workbench.plugins_create_plugin', '插件')}
-            </button>
-          )}
         </div>
       )}
     </div>
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.test.tsx b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
new file mode 100644
index 0000000000..859e439cb1
--- /dev/null
+++ b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
@@ -0,0 +1,64 @@
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
+import '@/i18n'
+import { PluginManagementWorkspace } from './PluginManagementWorkspace'
+
+function mockManagementFetch() {
+  vi.stubGlobal(
+    'fetch',
+    vi.fn((url: string) => {
+      const requestUrl = new URL(url, 'http://localhost')
+      if (requestUrl.pathname === '/api/plugins/installed') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ items: [] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/mcps/installed') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ items: [] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/system-skills/installed') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ items: [] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/mcp-providers') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ providers: [] }),
+        })
+      }
+      return Promise.resolve({
+        ok: true,
+        status: 200,
+        json: () => Promise.resolve({}),
+      })
+    })
+  )
+}
+
+describe('PluginManagementWorkspace', () => {
+  beforeEach(() => {
+    mockManagementFetch()
+  })
+
+  test('removes user plugin upload entry from plugin management', async () => {
+    render(<PluginManagementWorkspace />)
+
+    expect(await screen.findByText('暂无已安装插件')).toBeInTheDocument()
+    expect(screen.queryByTestId('plugin-management-upload-plugin-button')).not.toBeInTheDocument()
+
+    await userEvent.click(screen.getByTestId('plugin-management-create-button'))
+
+    expect(screen.queryByTestId('plugins-create-plugin-option')).not.toBeInTheDocument()
+  })
+})
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.tsx b/wework/src/components/plugins/PluginManagementWorkspace.tsx
index f10e2d1088..41024e43b5 100644
--- a/wework/src/components/plugins/PluginManagementWorkspace.tsx
+++ b/wework/src/components/plugins/PluginManagementWorkspace.tsx
@@ -1,8 +1,4 @@
-import {
-  ChevronRight,
-  MoreHorizontal,
-  Search,
-} from 'lucide-react'
+import { ChevronRight, MoreHorizontal, Search } from 'lucide-react'
 import type { FormEvent, ReactNode } from 'react'
 import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from '@/hooks/useTranslation'
@@ -12,20 +8,14 @@ import { createPluginApi } from '@/api/plugins'
 import { createSystemSkillApi } from '@/api/systemSkills'
 import { getRuntimeConfig } from '@/config/runtime'
 import { navigateTo } from '@/lib/navigation'
-import {
-  DESKTOP_TOP_BAR_BUTTON_CLASS,
-  DesktopTopBar,
-} from '@/components/layout/DesktopTopBar'
+import { DESKTOP_TOP_BAR_BUTTON_CLASS, DesktopTopBar } from '@/components/layout/DesktopTopBar'
 import {
   CustomMcpDialog,
   McpProviderBlock,
   SectionHeading,
   type CustomMcpFormState,
 } from './McpManagementSections'
-import {
-  serverConfigFromProviderServer,
-  serverKeyFromProviderServer,
-} from './mcp-utils'
+import { serverConfigFromProviderServer, serverKeyFromProviderServer } from './mcp-utils'
 import { parseOptionalStringRecordJson } from './mcp-json-import'
 import {
   InstalledMcpRow,
@@ -37,7 +27,6 @@ import {
 } from './PluginManagementRows'
 import { PluginCreateMenu } from './PluginCreateMenu'
 import { PluginDetailView } from './PluginDetailView'
-import { PluginUploadDialog } from './PluginUploadDialog'
 import { SkillUploadDialog } from './SkillUploadDialog'
 import type {
   InstalledMCP,
@@ -48,12 +37,7 @@ import type {
   MCPServer,
 } from '@/types/api'
 
-type ManagementTab =
-  | 'plugins'
-  | 'apps'
-  | 'mcp'
-  | 'skills'
-  | 'marketplace'
+type ManagementTab = 'plugins' | 'apps' | 'mcp' | 'skills' | 'marketplace'
 
 const tabs: Array<{
   id: ManagementTab
@@ -90,9 +74,7 @@ const tabs: Array<{
 function tabClassName(selected: boolean) {
   return [
     'h-9 shrink-0 rounded-lg px-3 text-[15px] font-semibold leading-5 transition-colors',
-    selected
-      ? 'bg-[#f3f3f4] text-[#101014]'
-      : 'text-[#85858c] hover:text-[#101014]',
+    selected ? 'bg-[#f3f3f4] text-[#101014]' : 'text-[#85858c] hover:text-[#101014]',
   ].join(' ')
 }
 
@@ -108,9 +90,7 @@ function createDefaultSystemSkillApi() {
 function getInstalledSkillId(item: InstalledSkill): number {
   const labels = item.metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   return Number(id ?? 0)
 }
 
@@ -127,9 +107,7 @@ function toInstalledSkillItem(item: InstalledSkill): InstalledSkillItem {
 function getInstalledMcpId(item: InstalledMCP): number {
   const labels = item.metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   return Number(id ?? 0)
 }
 
@@ -146,9 +124,7 @@ function toInstalledMcpItem(item: InstalledMCP): InstalledMcpItem {
 function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
   const labels = item.metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   const components = item.spec.components
   return {
     id: Number(id ?? 0),
@@ -182,16 +158,14 @@ const emptyCustomMcpForm: CustomMcpFormState = {
   headersJson: '',
 }
 
-function serverConfigFromCustomForm(
-  form: CustomMcpFormState,
-): InstalledMCPServerConfig {
+function serverConfigFromCustomForm(form: CustomMcpFormState): InstalledMCPServerConfig {
   if (form.type === 'stdio') {
     return {
       type: 'stdio',
       command: form.command.trim(),
       args: form.args
         .split(/\s+/)
-        .map((arg) => arg.trim())
+        .map(arg => arg.trim())
         .filter(Boolean),
       env: parseOptionalStringRecordJson(form.envJson) ?? undefined,
     }
@@ -227,38 +201,21 @@ export function PluginManagementWorkspace({
     return createMcpApi(createHttpClient({ baseUrl: apiBaseUrl }))
   }, [])
   const [installedMcps, setInstalledMcps] = useState<InstalledMcpItem[]>([])
-  const [installedPlugins, setInstalledPlugins] = useState<InstalledPluginItem[]>(
-    [],
-  )
-  const [installedSkills, setInstalledSkills] = useState<InstalledSkillItem[]>(
-    [],
-  )
+  const [installedPlugins, setInstalledPlugins] = useState<InstalledPluginItem[]>([])
+  const [installedSkills, setInstalledSkills] = useState<InstalledSkillItem[]>([])
   const [mcpProviders, setMcpProviders] = useState<MCPProviderInfo[]>([])
-  const [providerServers, setProviderServers] = useState<
-    Record<string, MCPServer[]>
-  >({})
-  const [providerErrors, setProviderErrors] = useState<Record<string, string>>(
-    {},
-  )
-  const [providerLoadingByKey, setProviderLoadingByKey] = useState<
-    Record<string, boolean>
-  >({})
-  const [providerSavingByKey, setProviderSavingByKey] = useState<
-    Record<string, boolean>
-  >({})
-  const [providerTokenInputs, setProviderTokenInputs] = useState<
-    Record<string, string>
-  >({})
+  const [providerServers, setProviderServers] = useState<Record<string, MCPServer[]>>({})
+  const [providerErrors, setProviderErrors] = useState<Record<string, string>>({})
+  const [providerLoadingByKey, setProviderLoadingByKey] = useState<Record<string, boolean>>({})
+  const [providerSavingByKey, setProviderSavingByKey] = useState<Record<string, boolean>>({})
+  const [providerTokenInputs, setProviderTokenInputs] = useState<Record<string, string>>({})
   const [isCreateMenuOpen, setIsCreateMenuOpen] = useState(false)
   const [showCustomMcpDialog, setShowCustomMcpDialog] = useState(false)
   const [showSkillUploadDialog, setShowSkillUploadDialog] = useState(false)
-  const [showPluginUploadDialog, setShowPluginUploadDialog] = useState(false)
   const [selectedPluginId, setSelectedPluginId] = useState<number | null>(null)
-  const [customMcpForm, setCustomMcpForm] =
-    useState<CustomMcpFormState>(emptyCustomMcpForm)
+  const [customMcpForm, setCustomMcpForm] = useState<CustomMcpFormState>(emptyCustomMcpForm)
   const [isCreatingCustomMcp, setIsCreatingCustomMcp] = useState(false)
   const [isUploadingSkill, setIsUploadingSkill] = useState(false)
-  const [isUploadingPlugin, setIsUploadingPlugin] = useState(false)
   const [isLoadingMcps, setIsLoadingMcps] = useState(true)
   const [isLoadingPlugins, setIsLoadingPlugins] = useState(true)
   const [isLoadingSkills, setIsLoadingSkills] = useState(true)
@@ -269,7 +226,7 @@ export function PluginManagementWorkspace({
 
     systemSkillApi
       .listInstalledSystemSkills()
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
         setInstalledSkills(response.items.map(toInstalledSkillItem))
       })
@@ -283,7 +240,7 @@ export function PluginManagementWorkspace({
 
     mcpApi
       .listInstalledMcps()
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
         setInstalledMcps(response.items.map(toInstalledMcpItem))
         setIsLoadingMcps(false)
@@ -296,7 +253,7 @@ export function PluginManagementWorkspace({
 
     pluginApi
       .listInstalledPlugins()
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
         setInstalledPlugins(response.items.map(toInstalledPluginItem))
         setIsLoadingPlugins(false)
@@ -309,7 +266,7 @@ export function PluginManagementWorkspace({
 
     mcpApi
       .listProviders()
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
         setMcpProviders(response.providers)
       })
@@ -325,7 +282,7 @@ export function PluginManagementWorkspace({
 
   const filteredInstalledSkills = useMemo(
     () =>
-      installedSkills.filter((skill) => {
+      installedSkills.filter(skill => {
         if (!normalizedQuery) return true
 
         return (
@@ -333,12 +290,12 @@ export function PluginManagementWorkspace({
           skill.description.toLowerCase().includes(normalizedQuery)
         )
       }),
-    [installedSkills, normalizedQuery],
+    [installedSkills, normalizedQuery]
   )
 
   const filteredInstalledMcps = useMemo(
     () =>
-      installedMcps.filter((mcp) => {
+      installedMcps.filter(mcp => {
         if (!normalizedQuery) return true
 
         return (
@@ -347,36 +304,35 @@ export function PluginManagementWorkspace({
           mcp.serverType.toLowerCase().includes(normalizedQuery)
         )
       }),
-    [installedMcps, normalizedQuery],
+    [installedMcps, normalizedQuery]
   )
 
   const filteredInstalledPlugins = useMemo(
     () =>
-      installedPlugins.filter((plugin) => {
+      installedPlugins.filter(plugin => {
         if (!normalizedQuery) return true
 
         return (
           plugin.name.toLowerCase().includes(normalizedQuery) ||
           plugin.description.toLowerCase().includes(normalizedQuery) ||
-          Object.keys(plugin.componentCounts).some((key) =>
-            key.toLowerCase().includes(normalizedQuery),
+          Object.keys(plugin.componentCounts).some(key =>
+            key.toLowerCase().includes(normalizedQuery)
           )
         )
       }),
-    [installedPlugins, normalizedQuery],
+    [installedPlugins, normalizedQuery]
   )
   const selectedPlugin = useMemo(
     () =>
       selectedPluginId === null
         ? null
-        : installedPlugins.find((plugin) => plugin.id === selectedPluginId) ??
-          null,
-    [installedPlugins, selectedPluginId],
+        : (installedPlugins.find(plugin => plugin.id === selectedPluginId) ?? null),
+    [installedPlugins, selectedPluginId]
   )
 
   const filteredMcpProviders = useMemo(
     () =>
-      mcpProviders.filter((provider) => {
+      mcpProviders.filter(provider => {
         if (!normalizedQuery) return true
 
         return (
@@ -385,96 +341,80 @@ export function PluginManagementWorkspace({
           provider.key.toLowerCase().includes(normalizedQuery)
         )
       }),
-    [mcpProviders, normalizedQuery],
+    [mcpProviders, normalizedQuery]
   )
 
   const toggleInstalledSkill = (id: number) => {
-    const skill = installedSkills.find((item) => item.id === id)
+    const skill = installedSkills.find(item => item.id === id)
     if (!skill) return
 
-    setInstalledSkills((previous) =>
-      previous.map((skill) =>
-        skill.id === id ? { ...skill, enabled: !skill.enabled } : skill,
-      ),
+    setInstalledSkills(previous =>
+      previous.map(skill => (skill.id === id ? { ...skill, enabled: !skill.enabled } : skill))
     )
 
     systemSkillApi.updateInstalledSystemSkill(id, !skill.enabled).catch(() => {
-      setInstalledSkills((previous) =>
-        previous.map((item) =>
-          item.id === id ? { ...item, enabled: skill.enabled } : item,
-        ),
+      setInstalledSkills(previous =>
+        previous.map(item => (item.id === id ? { ...item, enabled: skill.enabled } : item))
       )
     })
   }
 
   const uninstallInstalledSkill = (id: number) => {
-    const skill = installedSkills.find((item) => item.id === id)
+    const skill = installedSkills.find(item => item.id === id)
     if (!skill) return
 
-    setInstalledSkills((previous) => previous.filter((item) => item.id !== id))
+    setInstalledSkills(previous => previous.filter(item => item.id !== id))
     systemSkillApi
       .uninstallInstalledSystemSkill(id)
-      .catch(() => setInstalledSkills((previous) => [...previous, skill]))
+      .catch(() => setInstalledSkills(previous => [...previous, skill]))
   }
 
   const toggleInstalledMcp = (id: number) => {
-    setInstalledMcps((previous) =>
-      previous.map((mcp) =>
-        mcp.id === id ? { ...mcp, enabled: !mcp.enabled } : mcp,
-      ),
+    setInstalledMcps(previous =>
+      previous.map(mcp => (mcp.id === id ? { ...mcp, enabled: !mcp.enabled } : mcp))
     )
-    const mcp = installedMcps.find((item) => item.id === id)
+    const mcp = installedMcps.find(item => item.id === id)
     if (!mcp) return
 
     mcpApi.updateInstalledMcp(id, { enabled: !mcp.enabled }).catch(() => {
-      setInstalledMcps((previous) =>
-        previous.map((item) =>
-          item.id === id ? { ...item, enabled: mcp.enabled } : item,
-        ),
+      setInstalledMcps(previous =>
+        previous.map(item => (item.id === id ? { ...item, enabled: mcp.enabled } : item))
       )
     })
   }
 
   const uninstallInstalledMcp = (id: number) => {
-    const mcp = installedMcps.find((item) => item.id === id)
+    const mcp = installedMcps.find(item => item.id === id)
     if (!mcp) return
 
-    setInstalledMcps((previous) => previous.filter((item) => item.id !== id))
+    setInstalledMcps(previous => previous.filter(item => item.id !== id))
     mcpApi.uninstallInstalledMcp(id).catch(() => {
-      setInstalledMcps((previous) => [...previous, mcp])
+      setInstalledMcps(previous => [...previous, mcp])
     })
   }
 
   const toggleInstalledPlugin = (id: number) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
-    setInstalledPlugins((previous) =>
-      previous.map((item) =>
-        item.id === id ? { ...item, enabled: !item.enabled } : item,
-      ),
+    setInstalledPlugins(previous =>
+      previous.map(item => (item.id === id ? { ...item, enabled: !item.enabled } : item))
     )
     pluginApi.updateInstalledPlugin(id, { enabled: !plugin.enabled }).catch(() => {
-      setInstalledPlugins((previous) =>
-        previous.map((item) =>
-          item.id === id ? { ...item, enabled: plugin.enabled } : item,
-        ),
+      setInstalledPlugins(previous =>
+        previous.map(item => (item.id === id ? { ...item, enabled: plugin.enabled } : item))
       )
     })
   }
 
-  const togglePluginComponent = (
-    id: number,
-    componentKey: string,
-    enabled: boolean,
-  ) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+  const togglePluginComponent = (id: number, componentKey: string, enabled: boolean) => {
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
     const previousStates = plugin.raw.spec.componentStates || {}
     const nextStates = { ...previousStates, [componentKey]: enabled }
-    setInstalledPlugins((previous) =>
-      previous.map((item) =>
+    setInstalledPlugins(previous =>
+      previous.map(item =>
         item.id === id
           ? {
               ...item,
@@ -486,32 +426,28 @@ export function PluginManagementWorkspace({
                 },
               },
             }
-          : item,
-      ),
+          : item
+      )
     )
     pluginApi
       .updateInstalledPlugin(id, { componentStates: { [componentKey]: enabled } })
-      .then((updated) => {
+      .then(updated => {
         const nextItem = toInstalledPluginItem(updated)
-        setInstalledPlugins((previous) =>
-          previous.map((item) => (item.id === id ? nextItem : item)),
-        )
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? nextItem : item)))
       })
       .catch(() => {
-        setInstalledPlugins((previous) =>
-          previous.map((item) => (item.id === id ? plugin : item)),
-        )
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? plugin : item)))
       })
   }
 
   const uninstallInstalledPlugin = (id: number) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
-    setInstalledPlugins((previous) => previous.filter((item) => item.id !== id))
-    setSelectedPluginId((current) => (current === id ? null : current))
+    setInstalledPlugins(previous => previous.filter(item => item.id !== id))
+    setSelectedPluginId(current => (current === id ? null : current))
     pluginApi.uninstallInstalledPlugin(id).catch(() => {
-      setInstalledPlugins((previous) => [...previous, plugin])
+      setInstalledPlugins(previous => [...previous, plugin])
     })
   }
 
@@ -530,8 +466,8 @@ export function PluginManagementWorkspace({
         server: serverConfigFromCustomForm(customMcpForm),
         enabled: true,
       })
-      .then((item) => {
-        setInstalledMcps((previous) => [toInstalledMcpItem(item), ...previous])
+      .then(item => {
+        setInstalledMcps(previous => [toInstalledMcpItem(item), ...previous])
         setCustomMcpForm(emptyCustomMcpForm)
         setShowCustomMcpDialog(false)
       })
@@ -544,18 +480,13 @@ export function PluginManagementWorkspace({
       const uploaded = await systemSkillApi.uploadPersonalSkill(file, name)
       const labels = uploaded.metadata['labels']
       const skillId =
-        labels && typeof labels === 'object'
-          ? Number((labels as Record<string, unknown>).id)
-          : 0
+        labels && typeof labels === 'object' ? Number((labels as Record<string, unknown>).id) : 0
       if (!Number.isFinite(skillId) || skillId <= 0) {
         throw new Error('Uploaded skill is missing id')
       }
       const installed = await systemSkillApi.installPersonalSkill(skillId)
       const item = toInstalledSkillItem(installed)
-      setInstalledSkills((previous) => [
-        item,
-        ...previous.filter((skill) => skill.id !== item.id),
-      ])
+      setInstalledSkills(previous => [item, ...previous.filter(skill => skill.id !== item.id)])
       setActiveTab('skills')
       setShowSkillUploadDialog(false)
     } finally {
@@ -563,50 +494,34 @@ export function PluginManagementWorkspace({
     }
   }
 
-  const uploadPlugin = async (file: File) => {
-    setIsUploadingPlugin(true)
-    try {
-      const uploaded = await pluginApi.uploadPlugin(file)
-      const item = toInstalledPluginItem(uploaded)
-      setInstalledPlugins((previous) => [
-        item,
-        ...previous.filter((plugin) => plugin.id !== item.id),
-      ])
-      setActiveTab('plugins')
-      setShowPluginUploadDialog(false)
-    } finally {
-      setIsUploadingPlugin(false)
-    }
-  }
-
   const loadProviderServers = (providerKey: string) => {
-    setProviderLoadingByKey((previous) => ({ ...previous, [providerKey]: true }))
-    setProviderErrors((previous) => ({ ...previous, [providerKey]: '' }))
+    setProviderLoadingByKey(previous => ({ ...previous, [providerKey]: true }))
+    setProviderErrors(previous => ({ ...previous, [providerKey]: '' }))
 
     mcpApi
       .listProviderServers(providerKey)
-      .then((response) => {
+      .then(response => {
         if (!response.success) {
-          setProviderErrors((previous) => ({
+          setProviderErrors(previous => ({
             ...previous,
             [providerKey]: response.message,
           }))
-          setProviderServers((previous) => ({ ...previous, [providerKey]: [] }))
+          setProviderServers(previous => ({ ...previous, [providerKey]: [] }))
           return
         }
-        setProviderServers((previous) => ({
+        setProviderServers(previous => ({
           ...previous,
           [providerKey]: response.servers,
         }))
       })
       .catch((error: Error) => {
-        setProviderErrors((previous) => ({
+        setProviderErrors(previous => ({
           ...previous,
           [providerKey]: error.message,
         }))
       })
       .finally(() => {
-        setProviderLoadingByKey((previous) => ({
+        setProviderLoadingByKey(previous => ({
           ...previous,
           [providerKey]: false,
         }))
@@ -617,23 +532,21 @@ export function PluginManagementWorkspace({
     const value = providerTokenInputs[provider.key]?.trim()
     if (!value) return
 
-    setProviderSavingByKey((previous) => ({ ...previous, [provider.key]: true }))
+    setProviderSavingByKey(previous => ({ ...previous, [provider.key]: true }))
     mcpApi
       .updateProviderKeys({ [provider.token_field_name]: value })
       .then(() => {
-        setMcpProviders((previous) =>
-          previous.map((item) =>
-            item.key === provider.key ? { ...item, has_token: true } : item,
-          ),
+        setMcpProviders(previous =>
+          previous.map(item => (item.key === provider.key ? { ...item, has_token: true } : item))
         )
-        setProviderTokenInputs((previous) => ({
+        setProviderTokenInputs(previous => ({
           ...previous,
           [provider.key]: '',
         }))
         loadProviderServers(provider.key)
       })
       .finally(() => {
-        setProviderSavingByKey((previous) => ({
+        setProviderSavingByKey(previous => ({
           ...previous,
           [provider.key]: false,
         }))
@@ -651,15 +564,15 @@ export function PluginManagementWorkspace({
         server: serverConfigFromProviderServer(server),
         sourcePayload: server as unknown as Record<string, unknown>,
       })
-      .then((item) => {
+      .then(item => {
         const installed = toInstalledMcpItem(item)
-        setInstalledMcps((previous) => [
+        setInstalledMcps(previous => [
           installed,
-          ...previous.filter((mcp) => mcp.id !== installed.id),
+          ...previous.filter(mcp => mcp.id !== installed.id),
         ])
-        setProviderServers((previous) => ({
+        setProviderServers(previous => ({
           ...previous,
-          [provider.key]: (previous[provider.key] ?? []).map((candidate) =>
+          [provider.key]: (previous[provider.key] ?? []).map(candidate =>
             candidate.id === server.id
               ? {
                   ...candidate,
@@ -667,7 +580,7 @@ export function PluginManagementWorkspace({
                   installedMcpId: installed.id,
                   enabled: installed.enabled,
                 }
-              : candidate,
+              : candidate
           ),
         }))
       })
@@ -695,13 +608,10 @@ export function PluginManagementWorkspace({
           'sticky top-0 z-30 h-12 bg-white/94 pl-20 pr-4 backdrop-blur-xl md:h-[52px] md:pr-7',
           sidebarCollapsed ? 'md:pl-6' : 'md:pl-7',
         ].join(' ')}
-        left={(
+        left={
           <>
             {topBarLeftActions}
-            <nav
-              className="flex items-center gap-3 text-sm font-semibold"
-              aria-label="breadcrumb"
-            >
+            <nav className="flex items-center gap-3 text-sm font-semibold" aria-label="breadcrumb">
               <button
                 type="button"
                 className="text-[#85858c] transition-colors hover:text-[#101014]"
@@ -713,13 +623,13 @@ export function PluginManagementWorkspace({
               <span>{t('workbench.plugins_manage', '管理')}</span>
             </nav>
           </>
-        )}
-        right={(
+        }
+        right={
           <>
             <PluginCreateMenu
               isOpen={isCreateMenuOpen}
               buttonTestId="plugin-management-create-button"
-              onToggle={() => setIsCreateMenuOpen((previous) => !previous)}
+              onToggle={() => setIsCreateMenuOpen(previous => !previous)}
               onCreateSkill={() => {
                 setIsCreateMenuOpen(false)
                 setShowSkillUploadDialog(true)
@@ -728,10 +638,6 @@ export function PluginManagementWorkspace({
                 setIsCreateMenuOpen(false)
                 setShowCustomMcpDialog(true)
               }}
-              onCreatePlugin={() => {
-                setIsCreateMenuOpen(false)
-                setShowPluginUploadDialog(true)
-              }}
             />
             <button
               type="button"
@@ -741,7 +647,7 @@ export function PluginManagementWorkspace({
               <MoreHorizontal />
             </button>
           </>
-        )}
+        }
       />
 
       <section className="mx-auto flex w-full max-w-[940px] flex-col gap-8 px-5 pb-12 pt-8 md:pt-16">
@@ -750,7 +656,7 @@ export function PluginManagementWorkspace({
             className="scrollbar-none -mx-1 flex items-center gap-2 overflow-x-auto px-1"
             role="tablist"
           >
-            {tabs.map((tab) => {
+            {tabs.map(tab => {
               const count =
                 tab.id === 'plugins'
                   ? installedPlugins.length
@@ -781,13 +687,11 @@ export function PluginManagementWorkspace({
           </div>
 
           <label className="relative w-full shrink-0 md:w-[340px]">
-            <span className="sr-only">
-              {t('workbench.plugins_search_plugins', '搜索插件')}
-            </span>
+            <span className="sr-only">{t('workbench.plugins_search_plugins', '搜索插件')}</span>
             <Search className="pointer-events-none absolute left-4 top-1/2 h-4 w-4 -translate-y-1/2 text-[#85858c]" />
             <input
               value={query}
-              onChange={(event) => setQuery(event.target.value)}
+              onChange={event => setQuery(event.target.value)}
               placeholder={t('workbench.plugins_search_plugins', '搜索插件')}
               data-testid="plugin-management-search-input"
               className="h-10 w-full rounded-xl border border-[#dedee4] bg-white pl-11 pr-4 text-sm outline-none placeholder:text-[#85858c] focus:border-[#9da2ae]"
@@ -802,7 +706,7 @@ export function PluginManagementWorkspace({
                 {t('workbench.plugins_loading_plugins', '正在加载插件')}
               </div>
             ) : filteredInstalledPlugins.length > 0 ? (
-              filteredInstalledPlugins.map((plugin) => (
+              filteredInstalledPlugins.map(plugin => (
                 <InstalledPluginRow
                   key={plugin.id}
                   plugin={plugin}
@@ -813,20 +717,7 @@ export function PluginManagementWorkspace({
               ))
             ) : (
               <div className="flex flex-col items-start gap-3 text-sm font-semibold text-text-secondary">
-                <div>
-                  {t('workbench.plugins_no_installed_plugins', '暂无已安装插件')}
-                </div>
-                <button
-                  type="button"
-                  data-testid="plugin-management-upload-plugin-button"
-                  className="rounded-xl bg-text-primary px-4 py-2 text-background hover:bg-text-primary/90"
-                  onClick={() => setShowPluginUploadDialog(true)}
-                >
-                  {t(
-                    'workbench.plugins_plugin_upload_title',
-                    '上传 Claude Code 插件',
-                  )}
-                </button>
+                <div>{t('workbench.plugins_no_installed_plugins', '暂无已安装插件')}</div>
               </div>
             )}
           </div>
@@ -841,7 +732,7 @@ export function PluginManagementWorkspace({
                 title={t('workbench.plugins_installed_mcps', '已安装 MCP')}
                 description={t(
                   'workbench.plugins_installed_mcps_description',
-                  '全局安装后会进入设备安装清单，可单独启用或卸载。',
+                  '全局安装后会进入设备安装清单，可单独启用或卸载。'
                 )}
               />
               {isLoadingMcps ? (
@@ -849,7 +740,7 @@ export function PluginManagementWorkspace({
                   {t('workbench.plugins_loading_mcps', '正在加载 MCP')}
                 </div>
               ) : filteredInstalledMcps.length > 0 ? (
-                filteredInstalledMcps.map((mcp) => (
+                filteredInstalledMcps.map(mcp => (
                   <InstalledMcpRow
                     key={mcp.id}
                     mcp={mcp}
@@ -871,7 +762,7 @@ export function PluginManagementWorkspace({
                 {t('workbench.plugins_loading_skills', '正在加载技能')}
               </div>
             ) : filteredInstalledSkills.length > 0 ? (
-              filteredInstalledSkills.map((skill) => (
+              filteredInstalledSkills.map(skill => (
                 <InstalledSkillRow
                   key={skill.id}
                   skill={skill}
@@ -891,11 +782,11 @@ export function PluginManagementWorkspace({
               title={t('workbench.plugins_mcp_providers', 'MCP 供应商')}
               description={t(
                 'workbench.plugins_mcp_providers_description',
-                '配置 token 后同步供应商服务，并按供应商分区安装需要的 MCP。',
+                '配置 token 后同步供应商服务，并按供应商分区安装需要的 MCP。'
               )}
             />
             {filteredMcpProviders.length > 0 ? (
-              filteredMcpProviders.map((provider) => (
+              filteredMcpProviders.map(provider => (
                 <McpProviderBlock
                   key={provider.key}
                   provider={provider}
@@ -904,15 +795,15 @@ export function PluginManagementWorkspace({
                   tokenInput={providerTokenInputs[provider.key] ?? ''}
                   isLoading={providerLoadingByKey[provider.key] ?? false}
                   isSaving={providerSavingByKey[provider.key] ?? false}
-                  onTokenChange={(value) =>
-                    setProviderTokenInputs((previous) => ({
+                  onTokenChange={value =>
+                    setProviderTokenInputs(previous => ({
                       ...previous,
                       [provider.key]: value,
                     }))
                   }
                   onSaveToken={() => saveProviderToken(provider)}
                   onSync={() => loadProviderServers(provider.key)}
-                  onInstall={(server) => installProviderServer(provider, server)}
+                  onInstall={server => installProviderServer(provider, server)}
                 />
               ))
             ) : (
@@ -928,7 +819,7 @@ export function PluginManagementWorkspace({
           form={customMcpForm}
           isSubmitting={isCreatingCustomMcp}
           onCancel={() => setShowCustomMcpDialog(false)}
-          onChange={(nextForm) => setCustomMcpForm(nextForm)}
+          onChange={nextForm => setCustomMcpForm(nextForm)}
           onSubmit={createCustomMcp}
         />
       )}
@@ -939,13 +830,6 @@ export function PluginManagementWorkspace({
           onUpload={uploadPersonalSkill}
         />
       )}
-      {showPluginUploadDialog && (
-        <PluginUploadDialog
-          isUploading={isUploadingPlugin}
-          onCancel={() => setShowPluginUploadDialog(false)}
-          onUpload={uploadPlugin}
-        />
-      )}
     </main>
   )
 }
diff --git a/wework/src/components/plugins/PluginUploadDialog.test.tsx b/wework/src/components/plugins/PluginUploadDialog.test.tsx
deleted file mode 100644
index 07ff0b1e81..0000000000
--- a/wework/src/components/plugins/PluginUploadDialog.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, test, vi } from 'vitest'
-import '@/i18n'
-import { PluginUploadDialog } from './PluginUploadDialog'
-
-describe('PluginUploadDialog', () => {
-  test('rejects plugin packages larger than 50MB before upload', async () => {
-    const onUpload = vi.fn()
-    render(
-      <PluginUploadDialog
-        isUploading={false}
-        onCancel={vi.fn()}
-        onUpload={onUpload}
-      />,
-    )
-
-    const file = new File(['x'], 'large-plugin.zip', { type: 'application/zip' })
-    Object.defineProperty(file, 'size', { value: 50 * 1024 * 1024 + 1 })
-    await userEvent.upload(screen.getByTestId('plugin-upload-file-input'), file)
-
-    expect(screen.getByText('插件安装包不能超过 50MB')).toBeInTheDocument()
-    await userEvent.click(screen.getByTestId('plugin-upload-confirm-button'))
-    expect(onUpload).not.toHaveBeenCalled()
-  })
-
-  test('accepts uppercase zip filenames and surfaces upload failures', async () => {
-    const onUpload = vi.fn().mockRejectedValue(new Error('Backend rejected package'))
-    render(
-      <PluginUploadDialog
-        isUploading={false}
-        onCancel={vi.fn()}
-        onUpload={onUpload}
-      />,
-    )
-
-    const file = new File(['zip'], 'plugin.ZIP', { type: 'application/zip' })
-    await userEvent.upload(screen.getByTestId('plugin-upload-file-input'), file)
-    await userEvent.click(screen.getByTestId('plugin-upload-confirm-button'))
-
-    expect(onUpload).toHaveBeenCalledWith(file)
-    expect(await screen.findByText('Backend rejected package')).toBeInTheDocument()
-  })
-})
diff --git a/wework/src/components/plugins/PluginUploadDialog.tsx b/wework/src/components/plugins/PluginUploadDialog.tsx
deleted file mode 100644
index dba9cf9f41..0000000000
--- a/wework/src/components/plugins/PluginUploadDialog.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { Upload, X } from 'lucide-react'
-import { useState } from 'react'
-import { useTranslation } from '@/hooks/useTranslation'
-
-const MAX_PLUGIN_PACKAGE_SIZE_BYTES = 50 * 1024 * 1024
-
-export function PluginUploadDialog({
-  isUploading,
-  uploadError = null,
-  onCancel,
-  onErrorReset,
-  onUpload,
-}: {
-  isUploading: boolean
-  uploadError?: string | null
-  onCancel: () => void
-  onErrorReset?: () => void
-  onUpload: (file: File) => Promise<void>
-}) {
-  const { t } = useTranslation('common')
-  const [file, setFile] = useState<File | null>(null)
-  const [error, setError] = useState('')
-  const visibleError = error || uploadError
-
-  const selectFile = (nextFile: File | null) => {
-    setError('')
-    onErrorReset?.()
-    if (!nextFile) {
-      setFile(null)
-      return
-    }
-    if (!nextFile.name?.toLowerCase().endsWith('.zip')) {
-      setError(t('workbench.plugins_plugin_upload_zip_error', '请选择 .zip 插件包'))
-      setFile(null)
-      return
-    }
-    if (nextFile.size > MAX_PLUGIN_PACKAGE_SIZE_BYTES) {
-      setError(
-        t('workbench.plugins_plugin_upload_size_error', '插件安装包不能超过 50MB'),
-      )
-      setFile(null)
-      return
-    }
-    setFile(nextFile)
-  }
-
-  return (
-    <div className="fixed inset-0 z-modal flex items-center justify-center bg-black/35 px-4">
-      <form
-        className="w-full max-w-[480px] rounded-2xl border border-border bg-background p-5 shadow-xl"
-        onSubmit={(event) => {
-          event.preventDefault()
-          if (!file) {
-            setError(
-              t('workbench.plugins_plugin_upload_select_file', '请先选择插件包'),
-            )
-            return
-          }
-          onUpload(file).catch(uploadError => {
-            setError(
-              uploadError instanceof Error
-                ? uploadError.message
-                : t('workbench.plugins_plugin_upload_failed', '插件上传失败'),
-            )
-          })
-        }}
-      >
-        <div className="flex items-start justify-between gap-4">
-          <div>
-            <h2 className="text-lg font-semibold">
-              {t('workbench.plugins_plugin_upload_title', '上传 Claude Code 插件')}
-            </h2>
-            <p className="mt-1 text-sm text-text-secondary">
-              {t(
-                'workbench.plugins_plugin_upload_description',
-                '选择包含 .claude-plugin/plugin.json 的 ZIP 包。',
-              )}
-            </p>
-          </div>
-          <button
-            type="button"
-            aria-label={t('workbench.plugins_uninstall_cancel', '取消')}
-            className="flex h-9 w-9 items-center justify-center rounded-lg text-text-muted hover:bg-surface"
-            onClick={onCancel}
-          >
-            <X className="h-4 w-4" />
-          </button>
-        </div>
-
-        <label className="mt-5 flex min-h-36 cursor-pointer flex-col items-center justify-center rounded-2xl border border-dashed border-border bg-surface px-4 text-center hover:border-primary">
-          <Upload className="h-8 w-8 text-text-secondary" />
-          <span className="mt-3 text-sm font-semibold">
-            {file
-              ? file.name
-              : t('workbench.plugins_plugin_upload_drop_title', '选择插件 ZIP 包')}
-          </span>
-          <span className="mt-1 text-xs text-text-muted">
-            {t(
-              'workbench.plugins_plugin_upload_hint',
-              '支持 Claude Code 插件 ZIP，最大 50MB',
-            )}
-          </span>
-          <input
-            type="file"
-            accept=".zip,application/zip"
-            data-testid="plugin-upload-file-input"
-            className="sr-only"
-            onChange={(event) => selectFile(event.target.files?.[0] ?? null)}
-          />
-        </label>
-
-        {visibleError && (
-          <p className="mt-3 text-sm font-semibold text-red-500">{visibleError}</p>
-        )}
-
-        <div className="mt-5 flex justify-end gap-3">
-          <button
-            type="button"
-            className="h-10 rounded-xl border border-border px-4 text-sm font-semibold"
-            onClick={onCancel}
-          >
-            {t('workbench.plugins_uninstall_cancel', '取消')}
-          </button>
-          <button
-            type="submit"
-            data-testid="plugin-upload-confirm-button"
-            disabled={isUploading}
-            className="h-10 rounded-xl bg-text-primary px-4 text-sm font-semibold text-background hover:bg-text-primary/90 disabled:opacity-50"
-          >
-            {isUploading
-              ? t('workbench.plugins_plugin_uploading', '上传中')
-              : t('workbench.plugins_skill_upload_confirm', '上传')}
-          </button>
-        </div>
-      </form>
-    </div>
-  )
-}
diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index f1801caf14..9b1a111e14 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -23,7 +23,7 @@ function createSkillZipFile(name: string, rootSkillMd = false): File {
       '---',
       '',
       'Use this skill carefully.',
-    ].join('\n'),
+    ].join('\n')
   )
   const localHeader = new Uint8Array(30 + fileNameBytes.length)
   const localView = new DataView(localHeader.buffer)
@@ -55,13 +55,9 @@ function createSkillZipFile(name: string, rootSkillMd = false): File {
   endView.setUint32(12, centralHeader.length, true)
   endView.setUint32(16, centralDirectoryOffset, true)
 
-  return new File(
-    [localHeader, contentBytes, centralHeader, endHeader],
-    `${name}.zip`,
-    {
-      type: 'application/zip',
-    },
-  )
+  return new File([localHeader, contentBytes, centralHeader, endHeader], `${name}.zip`, {
+    type: 'application/zip',
+  })
 }
 
 function mockSystemSkillsFetch(
@@ -69,7 +65,9 @@ function mockSystemSkillsFetch(
     installState: 'not_installed' | 'installed' | 'update_available'
     enabled: boolean
     installedSkillId: number | null
-  }> = {},
+    pluginInstallState: 'not_installed' | 'installed' | 'update_available'
+    installedPluginId: number | null
+  }> = {}
 ) {
   const personalSkillsResponse = {
     items: [
@@ -254,6 +252,86 @@ function mockSystemSkillsFetch(
     },
     status: { state: 'Available' },
   }
+  const pluginCatalogItem = {
+    id: 100,
+    name: 'superpowers',
+    displayName: 'Superpowers',
+    description: 'System managed plugin',
+    version: '1.0.0',
+    author: 'Weibo',
+    enabled: true,
+    installState: overrides.pluginInstallState ?? 'not_installed',
+    installedPluginId: overrides.installedPluginId ?? null,
+    installedPluginIds: overrides.installedPluginId
+      ? { claudecode: overrides.installedPluginId, codex: overrides.installedPluginId + 1 }
+      : {},
+    variantIds: { claudecode: 100, codex: 101 },
+    sourceChecksum: 'sha256:system',
+    installedChecksum:
+      overrides.pluginInstallState === 'update_available' ? 'sha256:installed' : null,
+    components: {
+      skills: [],
+      commands: [{ name: 'test', path: 'commands/test.md' }],
+      agents: [],
+      hooks: [],
+      mcps: [],
+      lsps: [],
+      monitors: [],
+      bins: [],
+    },
+  }
+  const installedPluginResponse = {
+    apiVersion: 'agent.wecode.io/v1',
+    kind: 'InstalledPlugin',
+    metadata: {
+      name: 'superpowers',
+      namespace: 'default',
+      labels: { id: String(overrides.installedPluginId ?? 55) },
+    },
+    spec: {
+      source: {
+        type: 'system',
+        providerKey: 'claude-code',
+        pluginKey: 'superpowers',
+        catalogItemId: '100',
+        systemPluginId: 100,
+        runtime: 'claudecode',
+      },
+      displayName: 'Superpowers',
+      description: 'System managed plugin',
+      version: '1.0.0',
+      runtime: 'claudecode',
+      installState: 'installed',
+      enabled: true,
+      componentStates: { 'command:test': true },
+      manifest: { name: 'superpowers' },
+      components: pluginCatalogItem.components,
+      packageRef: {
+        storageKey: 'skill-binaries/55',
+        checksum: 'sha256:system',
+        sizeBytes: 100,
+      },
+      sourcePayload: null,
+    },
+    status: { state: 'Available' },
+  }
+  const installedCodexPluginResponse = {
+    ...installedPluginResponse,
+    metadata: {
+      ...installedPluginResponse.metadata,
+      labels: { id: String((overrides.installedPluginId ?? 55) + 1) },
+    },
+    spec: {
+      ...installedPluginResponse.spec,
+      source: {
+        ...installedPluginResponse.spec.source,
+        providerKey: 'codex',
+        systemPluginId: 101,
+        runtime: 'codex',
+      },
+      runtime: 'codex',
+    },
+  }
   const skill = (page: number) => ({
     id: `@weibo/page-${page}`,
     providerKey: 'weibo',
@@ -308,9 +386,7 @@ function mockSystemSkillsFetch(
           status: 201,
           json: () =>
             Promise.resolve(
-              body.skillId === 78
-                ? installedUploadedPersonalSkill
-                : installedPersonalSkill,
+              body.skillId === 78 ? installedUploadedPersonalSkill : installedPersonalSkill
             ),
         })
       }
@@ -349,6 +425,36 @@ function mockSystemSkillsFetch(
           json: () => Promise.resolve(customMcpResponse),
         })
       }
+      if (requestUrl.pathname === '/api/plugins/catalog') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ items: [pluginCatalogItem] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/plugins/catalog/100/install') {
+        return Promise.resolve({
+          ok: true,
+          status: 201,
+          json: () =>
+            Promise.resolve({ items: [installedPluginResponse, installedCodexPluginResponse] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/plugins/catalog/100/update') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () =>
+            Promise.resolve({ items: [installedPluginResponse, installedCodexPluginResponse] }),
+        })
+      }
+      if (requestUrl.pathname === '/api/plugins/installed') {
+        return Promise.resolve({
+          ok: true,
+          status: 200,
+          json: () => Promise.resolve({ items: [] }),
+        })
+      }
       const page = Number(requestUrl.searchParams.get('page') ?? 1)
       const keyword = requestUrl.searchParams.get('keyword')
       const item = skill(page)
@@ -392,7 +498,7 @@ function mockSystemSkillsFetch(
         status: init?.method === 'DELETE' ? 204 : 200,
         json: () => Promise.resolve(payload),
       })
-    }),
+    })
   )
 }
 
@@ -408,27 +514,52 @@ describe('PluginsWorkspace', () => {
     const skillsTab = screen.getByRole('tab', { name: '技能' })
 
     expect(skillsTab).toHaveAttribute('aria-selected', 'true')
-    expect(skillsTab).toHaveClass(
-      'bg-background',
-      'text-text-primary',
-    )
+    expect(skillsTab).toHaveClass('bg-background', 'text-text-primary')
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
   })
 
+  test('shows system plugin catalog and removes plugin upload entry', async () => {
+    render(<PluginsWorkspace />)
+
+    expect(await screen.findByText('Superpowers')).toBeInTheDocument()
+    expect(screen.getByText('System managed plugin')).toBeInTheDocument()
+    expect(screen.queryByText('上传 Claude Code 插件')).not.toBeInTheDocument()
+
+    await userEvent.click(screen.getByTestId('plugins-create-button'))
+    expect(screen.queryByTestId('plugins-create-plugin-option')).not.toBeInTheDocument()
+
+    await userEvent.click(screen.getByTestId('system-plugin-install-100'))
+
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/catalog/100/install',
+      expect.objectContaining({ method: 'POST' })
+    )
+  })
+
+  test('updates an installed system plugin from the catalog', async () => {
+    mockSystemSkillsFetch({
+      pluginInstallState: 'update_available',
+      installedPluginId: 55,
+    })
+    render(<PluginsWorkspace />)
+
+    expect(await screen.findByText('Superpowers')).toBeInTheDocument()
+    await userEvent.click(screen.getByTestId('system-plugin-update-100'))
+
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/catalog/100/update',
+      expect.objectContaining({ method: 'POST' })
+    )
+  })
+
   test('filters skills and shows the empty state for unmatched search', async () => {
     render(<PluginsWorkspace />)
 
     await openSkillsTab()
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
-    expect(screen.getByTestId('plugins-search-input')).toHaveClass(
-      'h-11',
-      'w-full',
-    )
+    expect(screen.getByTestId('plugins-search-input')).toHaveClass('h-11', 'w-full')
 
-    await userEvent.type(
-      screen.getByTestId('plugins-search-input'),
-      'does-not-exist',
-    )
+    await userEvent.type(screen.getByTestId('plugins-search-input'), 'does-not-exist')
 
     expect(await screen.findByText('找不到匹配的技能')).toBeInTheDocument()
     expect(screen.queryByText('Weibo Skill 1')).not.toBeInTheDocument()
@@ -441,38 +572,24 @@ describe('PluginsWorkspace', () => {
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
     expect(screen.getByTestId('plugins-workspace')).toHaveClass(
       'bg-background',
-      'text-text-primary',
+      'text-text-primary'
     )
     expect(screen.getByRole('tablist')).toHaveClass('w-full', 'md:w-fit')
     expect(screen.getByRole('tab', { name: '技能' })).toHaveClass(
       'h-7',
       'flex-1',
       'bg-background',
-      'text-text-primary',
-    )
-    expect(screen.getByTestId('plugins-search-input')).toHaveClass(
-      'text-[13px]',
-      'leading-[18px]',
-    )
-    expect(screen.getByTestId('plugins-mobile-section-filter')).toHaveClass(
-      'md:hidden',
-    )
-    expect(screen.getByTestId('plugins-section-filter')).toHaveClass(
-      'hidden',
-      'md:block',
+      'text-text-primary'
     )
+    expect(screen.getByTestId('plugins-search-input')).toHaveClass('text-[13px]', 'leading-[18px]')
+    expect(screen.getByTestId('plugins-mobile-section-filter')).toHaveClass('md:hidden')
+    expect(screen.getByTestId('plugins-section-filter')).toHaveClass('hidden', 'md:block')
 
     const catalogCard = screen.getByText('Weibo Skill 1').closest('article')
     expect(catalogCard).toHaveClass('grid', 'min-h-[72px]', 'border-b')
-    expect(catalogCard?.querySelector('button')).toHaveClass(
-      'h-11',
-      'w-11',
-    )
+    expect(catalogCard?.querySelector('button')).toHaveClass('h-11', 'w-11')
 
-    const catalogGrid = screen
-      .getByText('Weibo Skill 1')
-      .closest('section')
-      ?.querySelector('.grid')
+    const catalogGrid = screen.getByText('Weibo Skill 1').closest('section')?.querySelector('.grid')
     expect(catalogGrid).toHaveClass('grid-cols-1', 'sm:grid-cols-2')
   })
 
@@ -482,32 +599,21 @@ describe('PluginsWorkspace', () => {
     await openSkillsTab()
     expect(await screen.findByText('Excel Helper')).toBeInTheDocument()
 
-    await userEvent.selectOptions(
-      screen.getByTestId('plugins-section-filter'),
-      'personal',
-    )
+    await userEvent.selectOptions(screen.getByTestId('plugins-section-filter'), 'personal')
     expect(screen.getByText('Excel Helper')).toBeInTheDocument()
     expect(screen.queryByText('Weibo Skill 1')).not.toBeInTheDocument()
-    expect(
-      screen.queryByTestId('system-skills-pagination'),
-    ).not.toBeInTheDocument()
+    expect(screen.queryByTestId('system-skills-pagination')).not.toBeInTheDocument()
 
     await userEvent.click(screen.getByTestId('plugins-create-button'))
     expect(screen.getByTestId('plugins-create-menu')).toHaveClass(
       'bg-[rgb(var(--color-popover))]',
       'text-text-primary',
-      'isolate',
-    )
-    expect(
-      screen.getByTestId('plugins-create-skill-option'),
-    ).toBeInTheDocument()
-    expect(screen.getByTestId('plugins-create-skill-option')).toHaveClass(
-      'text-text-primary',
+      'isolate'
     )
+    expect(screen.getByTestId('plugins-create-skill-option')).toBeInTheDocument()
+    expect(screen.getByTestId('plugins-create-skill-option')).toHaveClass('text-text-primary')
     expect(screen.getByTestId('plugins-create-mcp-option')).toBeInTheDocument()
-    expect(screen.getByTestId('plugins-create-mcp-option')).toHaveClass(
-      'text-text-primary',
-    )
+    expect(screen.getByTestId('plugins-create-mcp-option')).toHaveClass('text-text-primary')
     await userEvent.click(screen.getByTestId('plugins-create-skill-option'))
     expect(screen.getByRole('dialog')).toBeInTheDocument()
     const upload = screen.getByTestId('skill-upload-file-input')
@@ -525,14 +631,14 @@ describe('PluginsWorkspace', () => {
       expect.objectContaining({
         method: 'POST',
         body: expect.any(FormData),
-      }),
+      })
     )
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills/install/personal',
       expect.objectContaining({
         method: 'POST',
         body: JSON.stringify({ skillId: 78 }),
-      }),
+      })
     )
   })
 
@@ -560,17 +666,11 @@ describe('PluginsWorkspace', () => {
     })
     await userEvent.click(screen.getByTestId('custom-mcp-apply-json-button'))
 
-    expect(screen.getByTestId('custom-mcp-name-input')).toHaveValue(
-      'local-docs',
-    )
-    expect(screen.getByTestId('custom-mcp-display-name-input')).toHaveValue(
-      'local-docs',
-    )
-    expect(screen.getByTestId('custom-mcp-url-input')).toHaveValue(
-      'https://mcp.example.com/local',
-    )
+    expect(screen.getByTestId('custom-mcp-name-input')).toHaveValue('local-docs')
+    expect(screen.getByTestId('custom-mcp-display-name-input')).toHaveValue('local-docs')
+    expect(screen.getByTestId('custom-mcp-url-input')).toHaveValue('https://mcp.example.com/local')
     expect(screen.getByTestId('custom-mcp-headers-input')).toHaveValue(
-      '{\n  "Authorization": "Bearer token"\n}',
+      '{\n  "Authorization": "Bearer token"\n}'
     )
     await userEvent.click(screen.getByTestId('custom-mcp-submit-button'))
 
@@ -590,7 +690,7 @@ describe('PluginsWorkspace', () => {
           },
           enabled: true,
         }),
-      }),
+      })
     )
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
   })
@@ -623,12 +723,10 @@ describe('PluginsWorkspace', () => {
     const personalHeading = screen.getByRole('heading', { name: '个人' })
 
     expect(
-      systemHeading.compareDocumentPosition(pagination) &
-        Node.DOCUMENT_POSITION_FOLLOWING,
+      systemHeading.compareDocumentPosition(pagination) & Node.DOCUMENT_POSITION_FOLLOWING
     ).toBeTruthy()
     expect(
-      pagination.compareDocumentPosition(personalHeading) &
-        Node.DOCUMENT_POSITION_FOLLOWING,
+      pagination.compareDocumentPosition(personalHeading) & Node.DOCUMENT_POSITION_FOLLOWING
     ).toBeTruthy()
   })
 
@@ -641,45 +739,35 @@ describe('PluginsWorkspace', () => {
     expect(await screen.findByText('Hot Search MCP')).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/mcp-providers/mcp_router/servers',
-      expect.objectContaining({ method: 'POST' }),
+      expect.objectContaining({ method: 'POST' })
     )
     expect(
-      vi
-        .mocked(fetch)
-        .mock.calls.some(([url]) =>
-          String(url).includes('/api/mcps/installed'),
-        ),
+      vi.mocked(fetch).mock.calls.some(([url]) => String(url).includes('/api/mcps/installed'))
     ).toBe(false)
 
-    await userEvent.click(
-      screen.getByTestId('mcp-market-install--mcp_router-hot-search'),
-    )
+    await userEvent.click(screen.getByTestId('mcp-market-install--mcp_router-hot-search'))
 
     expect(
-      await screen.findByTestId('mcp-market-uninstall--mcp_router-hot-search'),
+      await screen.findByTestId('mcp-market-uninstall--mcp_router-hot-search')
     ).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/mcps/install',
       expect.objectContaining({
         method: 'POST',
         body: expect.stringContaining('"providerKey":"mcp_router"'),
-      }),
+      })
     )
 
-    await userEvent.click(
-      screen.getByTestId('mcp-market-uninstall--mcp_router-hot-search'),
-    )
+    await userEvent.click(screen.getByTestId('mcp-market-uninstall--mcp_router-hot-search'))
     expect(screen.getByRole('dialog')).toBeInTheDocument()
-    await userEvent.click(
-      screen.getByTestId('mcp-market-confirm-uninstall-button'),
-    )
+    await userEvent.click(screen.getByTestId('mcp-market-confirm-uninstall-button'))
 
     expect(fetch).toHaveBeenCalledWith(
       '/api/mcps/installed/9',
-      expect.objectContaining({ method: 'DELETE' }),
+      expect.objectContaining({ method: 'DELETE' })
     )
     expect(
-      await screen.findByTestId('mcp-market-install--mcp_router-hot-search'),
+      await screen.findByTestId('mcp-market-install--mcp_router-hot-search')
     ).toBeInTheDocument()
   })
 
@@ -694,7 +782,7 @@ describe('PluginsWorkspace', () => {
     expect(await screen.findByText('Weibo Skill 2')).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills?category=system&page=2&pageSize=20',
-      expect.objectContaining({ method: 'GET' }),
+      expect.objectContaining({ method: 'GET' })
     )
   })
 
@@ -704,19 +792,15 @@ describe('PluginsWorkspace', () => {
     await openSkillsTab()
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
 
-    await userEvent.click(
-      screen.getByTestId('system-skill-install--weibo-page-1'),
-    )
+    await userEvent.click(screen.getByTestId('system-skill-install--weibo-page-1'))
 
-    expect(
-      await screen.findByTestId('system-skill-uninstall--weibo-page-1'),
-    ).toBeInTheDocument()
+    expect(await screen.findByTestId('system-skill-uninstall--weibo-page-1')).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills/install',
       expect.objectContaining({
         method: 'POST',
         body: expect.stringContaining('"catalogItemId":"@weibo/page-1"'),
-      }),
+      })
     )
   })
 
@@ -725,23 +809,19 @@ describe('PluginsWorkspace', () => {
 
     await openSkillsTab()
     expect(await screen.findByText('Excel Helper')).toBeInTheDocument()
-    expect(
-      screen.getByTestId('system-skill-install-personal-excel-helper'),
-    ).toBeInTheDocument()
+    expect(screen.getByTestId('system-skill-install-personal-excel-helper')).toBeInTheDocument()
 
-    await userEvent.click(
-      screen.getByTestId('system-skill-install-personal-excel-helper'),
-    )
+    await userEvent.click(screen.getByTestId('system-skill-install-personal-excel-helper'))
 
     expect(
-      await screen.findByTestId('system-skill-uninstall-personal-excel-helper'),
+      await screen.findByTestId('system-skill-uninstall-personal-excel-helper')
     ).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills/install/personal',
       expect.objectContaining({
         method: 'POST',
         body: '{"skillId":77}',
-      }),
+      })
     )
   })
 
@@ -756,25 +836,17 @@ describe('PluginsWorkspace', () => {
 
     await openSkillsTab()
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
-    expect(
-      screen.queryByTestId('system-skill-install--weibo-page-1'),
-    ).not.toBeInTheDocument()
+    expect(screen.queryByTestId('system-skill-install--weibo-page-1')).not.toBeInTheDocument()
 
-    await userEvent.click(
-      screen.getByTestId('system-skill-uninstall--weibo-page-1'),
-    )
+    await userEvent.click(screen.getByTestId('system-skill-uninstall--weibo-page-1'))
 
     expect(screen.getByRole('dialog')).toBeInTheDocument()
-    await userEvent.click(
-      screen.getByTestId('system-skill-confirm-uninstall-button'),
-    )
+    await userEvent.click(screen.getByTestId('system-skill-confirm-uninstall-button'))
 
-    expect(
-      await screen.findByTestId('system-skill-install--weibo-page-1'),
-    ).toBeInTheDocument()
+    expect(await screen.findByTestId('system-skill-install--weibo-page-1')).toBeInTheDocument()
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills/installed/42',
-      expect.objectContaining({ method: 'DELETE' }),
+      expect.objectContaining({ method: 'DELETE' })
     )
   })
 
@@ -790,16 +862,14 @@ describe('PluginsWorkspace', () => {
     await openSkillsTab()
     expect(await screen.findByText('Weibo Skill 1')).toBeInTheDocument()
 
-    await userEvent.click(
-      screen.getByTestId('system-skill-update--weibo-page-1'),
-    )
+    await userEvent.click(screen.getByTestId('system-skill-update--weibo-page-1'))
 
     expect(fetch).toHaveBeenCalledWith(
       '/api/system-skills/install',
       expect.objectContaining({
         method: 'POST',
         body: expect.stringContaining('"catalogItemId":"@weibo/page-1"'),
-      }),
+      })
     )
   })
 })
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index bc5191759b..dfdbe876bb 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -1,8 +1,12 @@
 import {
+  Boxes,
   BookOpen,
+  Check,
   ImageIcon,
   MessageCircle,
   MoreHorizontal,
+  Plus,
+  RefreshCw,
   Search,
   Settings,
   Sparkles,
@@ -10,10 +14,7 @@ import {
 import type { FormEvent, ReactNode } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from '@/hooks/useTranslation'
-import {
-  DESKTOP_TOP_BAR_BUTTON_CLASS,
-  DesktopTopBar,
-} from '@/components/layout/DesktopTopBar'
+import { DESKTOP_TOP_BAR_BUTTON_CLASS, DesktopTopBar } from '@/components/layout/DesktopTopBar'
 import { useIsMobile } from '@/hooks/useIsMobile'
 import { createHttpClient } from '@/api/http'
 import { createMcpApi } from '@/api/mcps'
@@ -24,17 +25,16 @@ import { navigateTo } from '@/lib/navigation'
 import type {
   InstalledSkill,
   InstalledPlugin,
+  InstalledPluginListResponse,
   InstalledMCPServerConfig,
   MCPProviderInfo,
   MCPServer,
   PersonalSkill,
+  PluginCatalogItem,
   SystemSkillCatalogItem,
   SystemSkillProviderError,
 } from '@/types/api'
-import {
-  InstalledPluginRow,
-  type InstalledPluginItem,
-} from './PluginManagementRows'
+import { type InstalledPluginItem } from './PluginManagementRows'
 import {
   CatalogSection,
   ConfirmUninstallDialog,
@@ -42,18 +42,11 @@ import {
   type CatalogItem,
   type CatalogSectionId,
 } from './PluginCatalogSections'
-import {
-  CustomMcpDialog,
-  type CustomMcpFormState,
-} from './McpManagementSections'
-import {
-  serverConfigFromProviderServer,
-  serverKeyFromProviderServer,
-} from './mcp-utils'
+import { CustomMcpDialog, type CustomMcpFormState } from './McpManagementSections'
+import { serverConfigFromProviderServer, serverKeyFromProviderServer } from './mcp-utils'
 import { parseOptionalStringRecordJson } from './mcp-json-import'
 import { PluginCreateMenu } from './PluginCreateMenu'
 import { PluginDetailView } from './PluginDetailView'
-import { PluginUploadDialog } from './PluginUploadDialog'
 import { SkillUploadDialog } from './SkillUploadDialog'
 
 type CatalogTab = 'mcp' | 'skills' | 'plugins'
@@ -88,6 +81,12 @@ interface McpMarketplaceState {
   error: string | null
 }
 
+interface PluginCatalogState {
+  items: PluginCatalogItem[]
+  isLoading: boolean
+  error: string | null
+}
+
 const sections: CatalogSectionId[] = ['recommended', 'system', 'personal']
 const SYSTEM_SKILL_PAGE_SIZE = 20
 const emptyCustomMcpForm: CustomMcpFormState = {
@@ -102,10 +101,7 @@ const emptyCustomMcpForm: CustomMcpFormState = {
   headersJson: '',
 }
 
-const skillIconByName: Record<
-  string,
-  Pick<CatalogItem, 'icon' | 'iconClassName'>
-> = {
+const skillIconByName: Record<string, Pick<CatalogItem, 'icon' | 'iconClassName'>> = {
   'image-gen': {
     icon: ImageIcon,
     iconClassName: 'bg-sky-100 text-sky-600',
@@ -116,9 +112,7 @@ const skillIconByName: Record<
   },
 }
 
-function getSkillIcon(
-  item: SystemSkillCatalogItem,
-): Pick<CatalogItem, 'icon' | 'iconClassName'> {
+function getSkillIcon(item: SystemSkillCatalogItem): Pick<CatalogItem, 'icon' | 'iconClassName'> {
   if (skillIconByName[item.name]) {
     return skillIconByName[item.name]
   }
@@ -130,7 +124,7 @@ function getSkillIcon(
   }
   if (
     item.tags.includes('image') ||
-    item.capabilities.some((capability) => capability.includes('image'))
+    item.capabilities.some(capability => capability.includes('image'))
   ) {
     return {
       icon: ImageIcon,
@@ -178,7 +172,7 @@ function getInstalledSkillKey(item: InstalledSkill): string {
 
 function toPersonalCatalogItem(
   item: PersonalSkill,
-  installedBySkillKey: Map<string, InstalledSkill> = new Map(),
+  installedBySkillKey: Map<string, InstalledSkill> = new Map()
 ): CatalogItem {
   const installed = installedBySkillKey.get(item.metadata.name)
   return {
@@ -202,9 +196,7 @@ function toPersonalCatalogItem(
 function getInstalledSkillId(item: InstalledSkill): number | null {
   const labels = item.metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   const parsed = Number(id)
   return Number.isFinite(parsed) && parsed > 0 ? parsed : null
 }
@@ -212,9 +204,7 @@ function getInstalledSkillId(item: InstalledSkill): number | null {
 function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
   const labels = item.metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   const components = item.spec.components
   return {
     id: Number(id ?? 0),
@@ -236,28 +226,37 @@ function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
   }
 }
 
-function getKindIdFromMetadata(
-  metadata: Record<string, unknown>,
-): number | null {
+function componentCountsFromPlugin(
+  components: PluginCatalogItem['components']
+): Record<string, number> {
+  return {
+    skills: components.skills.length,
+    commands: components.commands.length,
+    agents: components.agents.length,
+    mcp: components.mcps.length,
+    hooks: components.hooks.length,
+    lsp: components.lsps.length,
+    monitors: components.monitors.length,
+    bin: components.bins.length,
+  }
+}
+
+function getKindIdFromMetadata(metadata: Record<string, unknown>): number | null {
   const labels = metadata['labels']
   const id =
-    labels && typeof labels === 'object'
-      ? (labels as Record<string, unknown>).id
-      : undefined
+    labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
   const parsed = Number(id)
   return Number.isFinite(parsed) && parsed > 0 ? parsed : null
 }
 
-function serverConfigFromCustomForm(
-  form: CustomMcpFormState,
-): InstalledMCPServerConfig {
+function serverConfigFromCustomForm(form: CustomMcpFormState): InstalledMCPServerConfig {
   if (form.type === 'stdio') {
     return {
       type: 'stdio',
       command: form.command.trim(),
       args: form.args
         .split(/\s+/)
-        .map((arg) => arg.trim())
+        .map(arg => arg.trim())
         .filter(Boolean),
       env: parseOptionalStringRecordJson(form.envJson) ?? undefined,
     }
@@ -308,10 +307,7 @@ function MarketplaceHero() {
         <div className="inline-flex max-w-full items-center gap-2.5 rounded-xl border border-background/70 bg-background/80 px-4 py-2.5 text-sm font-semibold leading-5 text-text-primary shadow-[0_10px_32px_rgba(82,88,132,0.18)] backdrop-blur-md">
           <Sparkles className="h-4 w-4 shrink-0 text-primary" />
           <span className="truncate">
-            {t(
-              'workbench.plugins_hero_prompt',
-              '帮我整理本周的项目进度并生成可视化报告',
-            )}
+            {t('workbench.plugins_hero_prompt', '帮我整理本周的项目进度并生成可视化报告')}
           </span>
         </div>
         <button
@@ -323,7 +319,7 @@ function MarketplaceHero() {
         </button>
       </div>
       <div className="absolute right-7 top-1/2 z-0 flex -translate-y-1/2 flex-col gap-3">
-        {[0, 1, 2, 3, 4].map((dot) => (
+        {[0, 1, 2, 3, 4].map(dot => (
           <span
             key={dot}
             className={[
@@ -337,6 +333,79 @@ function MarketplaceHero() {
   )
 }
 
+function SystemPluginCatalogRow({
+  plugin,
+  installLabel,
+  updateLabel,
+  enabledLabel,
+  onInstall,
+  onUpdate,
+}: {
+  plugin: PluginCatalogItem
+  installLabel: string
+  updateLabel: string
+  enabledLabel: string
+  onInstall: () => void
+  onUpdate: () => void
+}) {
+  const counts = componentCountsFromPlugin(plugin.components)
+  const componentLabels = Object.entries(counts)
+    .filter(([, count]) => count > 0)
+    .map(([key, count]) => `${key} ${count}`)
+  const safeId = String(plugin.id).replace(/[^a-zA-Z0-9_-]/g, '-')
+
+  return (
+    <article className="group flex min-h-[84px] items-center gap-3 rounded-2xl border border-border/70 bg-background px-3 py-3 shadow-sm hover:bg-surface sm:min-h-[74px] sm:gap-4 sm:rounded-lg sm:border-0 sm:bg-transparent sm:py-2 sm:shadow-none">
+      <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-violet-50 text-violet-600">
+        <Boxes className="h-6 w-6" />
+      </div>
+      <div className="min-w-0 flex-1">
+        <div className="flex min-w-0 items-center gap-2">
+          <h3 className="truncate text-base font-semibold leading-5 sm:text-[15px]">
+            {plugin.displayName || plugin.name}
+          </h3>
+          {plugin.version && (
+            <span className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted">
+              {plugin.version}
+            </span>
+          )}
+        </div>
+        <p className="mt-1 max-h-10 overflow-hidden text-sm leading-5 text-text-secondary sm:truncate">
+          {plugin.description || componentLabels.join(' · ')}
+        </p>
+      </div>
+      {plugin.installState === 'update_available' ? (
+        <button
+          type="button"
+          aria-label={updateLabel}
+          data-testid={`system-plugin-update-${safeId}`}
+          onClick={onUpdate}
+          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl bg-surface hover:bg-muted sm:h-8 sm:w-8 sm:rounded-lg"
+        >
+          <RefreshCw className="h-4 w-4" />
+        </button>
+      ) : plugin.installState === 'installed' ? (
+        <span
+          aria-label={enabledLabel}
+          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-text-muted sm:h-8 sm:w-8 sm:rounded-lg"
+        >
+          <Check className="h-4 w-4" />
+        </span>
+      ) : (
+        <button
+          type="button"
+          aria-label={installLabel}
+          data-testid={`system-plugin-install-${safeId}`}
+          onClick={onInstall}
+          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl bg-surface hover:bg-muted sm:h-8 sm:w-8 sm:rounded-lg"
+        >
+          <Plus className="h-4 w-4" />
+        </button>
+      )}
+    </article>
+  )
+}
+
 interface PluginsWorkspaceProps {
   sidebarCollapsed?: boolean
   topBarLeftActions?: ReactNode
@@ -350,34 +419,26 @@ export function PluginsWorkspace({
   const isMobile = useIsMobile()
   const [activeTab, setActiveTab] = useState<CatalogTab>('plugins')
   const [query, setQuery] = useState('')
-  const [sectionFilter, setSectionFilter] = useState<CatalogSectionId | 'all'>(
-    'all',
-  )
-  const [pendingUninstallItem, setPendingUninstallItem] =
-    useState<CatalogItem | null>(null)
-  const [pendingUninstallMcp, setPendingUninstallMcp] =
-    useState<PendingMcpUninstall | null>(null)
+  const [sectionFilter, setSectionFilter] = useState<CatalogSectionId | 'all'>('all')
+  const [pendingUninstallItem, setPendingUninstallItem] = useState<CatalogItem | null>(null)
+  const [pendingUninstallMcp, setPendingUninstallMcp] = useState<PendingMcpUninstall | null>(null)
   const [isCreateMenuOpen, setIsCreateMenuOpen] = useState(false)
   const [showCustomMcpDialog, setShowCustomMcpDialog] = useState(false)
   const [showSkillUploadDialog, setShowSkillUploadDialog] = useState(false)
-  const [showPluginUploadDialog, setShowPluginUploadDialog] = useState(false)
   const [selectedPluginId, setSelectedPluginId] = useState<number | null>(null)
-  const [customMcpForm, setCustomMcpForm] =
-    useState<CustomMcpFormState>(emptyCustomMcpForm)
+  const [customMcpForm, setCustomMcpForm] = useState<CustomMcpFormState>(emptyCustomMcpForm)
   const [isCreatingCustomMcp, setIsCreatingCustomMcp] = useState(false)
   const [isUploadingSkill, setIsUploadingSkill] = useState(false)
-  const [isUploadingPlugin, setIsUploadingPlugin] = useState(false)
-  const [pluginUploadError, setPluginUploadError] = useState<string | null>(
-    null,
-  )
   const [systemSkillPage, setSystemSkillPage] = useState(1)
   const systemSkillApi = useMemo(() => createDefaultSystemSkillApi(), [])
   const mcpApi = useMemo(() => createDefaultMcpApi(), [])
   const pluginApi = useMemo(() => createDefaultPluginApi(), [])
-  const [installedPlugins, setInstalledPlugins] = useState<
-    InstalledPluginItem[]
-  >([])
-  const [isLoadingPlugins, setIsLoadingPlugins] = useState(true)
+  const [installedPlugins, setInstalledPlugins] = useState<InstalledPluginItem[]>([])
+  const [pluginCatalogState, setPluginCatalogState] = useState<PluginCatalogState>({
+    items: [],
+    isLoading: true,
+    error: null,
+  })
   const [systemSkillState, setSystemSkillState] = useState<SystemSkillState>({
     items: [],
     providerErrors: [],
@@ -387,42 +448,32 @@ export function PluginsWorkspace({
     isLoading: true,
     error: null,
   })
-  const [personalSkillState, setPersonalSkillState] =
-    useState<PersonalSkillState>({
-      items: [],
-      isLoading: true,
-      error: null,
-    })
-  const [mcpMarketplaceState, setMcpMarketplaceState] =
-    useState<McpMarketplaceState>({
-      providers: [],
-      providerServers: {},
-      providerErrors: {},
-      providerLoadingByKey: {},
-      isLoading: true,
-      error: null,
-    })
+  const [personalSkillState, setPersonalSkillState] = useState<PersonalSkillState>({
+    items: [],
+    isLoading: true,
+    error: null,
+  })
+  const [mcpMarketplaceState, setMcpMarketplaceState] = useState<McpMarketplaceState>({
+    providers: [],
+    providerServers: {},
+    providerErrors: {},
+    providerLoadingByKey: {},
+    isLoading: true,
+    error: null,
+  })
   const catalog = useMemo(
-    () =>
-      activeTab === 'skills'
-        ? [...systemSkillState.items, ...personalSkillState.items]
-        : [],
-    [activeTab, personalSkillState.items, systemSkillState.items],
+    () => (activeTab === 'skills' ? [...systemSkillState.items, ...personalSkillState.items] : []),
+    [activeTab, personalSkillState.items, systemSkillState.items]
   )
   const normalizedQuery = query.trim().toLowerCase()
-  const totalSkillPages = Math.max(
-    1,
-    Math.ceil(systemSkillState.total / systemSkillState.pageSize),
-  )
+  const totalSkillPages = Math.max(1, Math.ceil(systemSkillState.total / systemSkillState.pageSize))
   const canGoToPreviousSkillPage = systemSkillState.page > 1
   const canGoToNextSkillPage = systemSkillState.page < totalSkillPages
 
   const updateCatalogItem = (itemId: string, updates: Partial<CatalogItem>) => {
-    setSystemSkillState((previous) => ({
+    setSystemSkillState(previous => ({
       ...previous,
-      items: previous.items.map((item) =>
-        item.id === itemId ? { ...item, ...updates } : item,
-      ),
+      items: previous.items.map(item => (item.id === itemId ? { ...item, ...updates } : item)),
     }))
   }
 
@@ -430,22 +481,18 @@ export function PluginsWorkspace({
     if (item.sourceType === 'personal') {
       if (!item.personalSkillId) return
 
-      setPersonalSkillState((previous) => ({
+      setPersonalSkillState(previous => ({
         ...previous,
-        items: previous.items.map((skill) =>
-          skill.id === item.id
-            ? { ...skill, installState: 'installed', enabled: true }
-            : skill,
+        items: previous.items.map(skill =>
+          skill.id === item.id ? { ...skill, installState: 'installed', enabled: true } : skill
         ),
       }))
 
       try {
-        const installed = await systemSkillApi.installPersonalSkill(
-          item.personalSkillId,
-        )
-        setPersonalSkillState((previous) => ({
+        const installed = await systemSkillApi.installPersonalSkill(item.personalSkillId)
+        setPersonalSkillState(previous => ({
           ...previous,
-          items: previous.items.map((skill) =>
+          items: previous.items.map(skill =>
             skill.id === item.id
               ? {
                   ...skill,
@@ -453,14 +500,14 @@ export function PluginsWorkspace({
                   installedSkillId: getInstalledSkillId(installed),
                   enabled: installed.spec.enabled,
                 }
-              : skill,
+              : skill
           ),
           error: null,
         }))
       } catch (error) {
-        setPersonalSkillState((previous) => ({
+        setPersonalSkillState(previous => ({
           ...previous,
-          items: previous.items.map((skill) =>
+          items: previous.items.map(skill =>
             skill.id === item.id
               ? {
                   ...skill,
@@ -468,12 +515,9 @@ export function PluginsWorkspace({
                   installedSkillId: item.installedSkillId,
                   enabled: item.enabled,
                 }
-              : skill,
+              : skill
           ),
-          error:
-            error instanceof Error
-              ? error.message
-              : 'Failed to install personal skill',
+          error: error instanceof Error ? error.message : 'Failed to install personal skill',
         }))
       }
       return
@@ -503,12 +547,9 @@ export function PluginsWorkspace({
         installState: 'not_installed',
         enabled: false,
       })
-      setSystemSkillState((previous) => ({
+      setSystemSkillState(previous => ({
         ...previous,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to install system skill',
+        error: error instanceof Error ? error.message : 'Failed to install system skill',
       }))
     }
   }
@@ -517,9 +558,9 @@ export function PluginsWorkspace({
     if (item.sourceType === 'personal') {
       if (!item.installedSkillId) return
 
-      setPersonalSkillState((previous) => ({
+      setPersonalSkillState(previous => ({
         ...previous,
-        items: previous.items.map((skill) =>
+        items: previous.items.map(skill =>
           skill.id === item.id
             ? {
                 ...skill,
@@ -527,24 +568,17 @@ export function PluginsWorkspace({
                 installedSkillId: null,
                 enabled: false,
               }
-            : skill,
+            : skill
         ),
       }))
 
       try {
-        await systemSkillApi.uninstallInstalledSystemSkill(
-          item.installedSkillId,
-        )
+        await systemSkillApi.uninstallInstalledSystemSkill(item.installedSkillId)
       } catch (error) {
-        setPersonalSkillState((previous) => ({
+        setPersonalSkillState(previous => ({
           ...previous,
-          items: previous.items.map((skill) =>
-            skill.id === item.id ? item : skill,
-          ),
-          error:
-            error instanceof Error
-              ? error.message
-              : 'Failed to uninstall personal skill',
+          items: previous.items.map(skill => (skill.id === item.id ? item : skill)),
+          error: error instanceof Error ? error.message : 'Failed to uninstall personal skill',
         }))
       }
       return
@@ -566,19 +600,16 @@ export function PluginsWorkspace({
         installedSkillId: item.installedSkillId,
         enabled: item.enabled,
       })
-      setSystemSkillState((previous) => ({
+      setSystemSkillState(previous => ({
         ...previous,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to uninstall system skill',
+        error: error instanceof Error ? error.message : 'Failed to uninstall system skill',
       }))
     }
   }
 
   const loadMcpProviderServers = useCallback(
     (providerKey: string) => {
-      setMcpMarketplaceState((previous) => ({
+      setMcpMarketplaceState(previous => ({
         ...previous,
         providerLoadingByKey: {
           ...previous.providerLoadingByKey,
@@ -592,8 +623,8 @@ export function PluginsWorkspace({
 
       mcpApi
         .listProviderServers(providerKey)
-        .then((response) => {
-          setMcpMarketplaceState((previous) => ({
+        .then(response => {
+          setMcpMarketplaceState(previous => ({
             ...previous,
             providerServers: {
               ...previous.providerServers,
@@ -606,7 +637,7 @@ export function PluginsWorkspace({
           }))
         })
         .catch((error: Error) => {
-          setMcpMarketplaceState((previous) => ({
+          setMcpMarketplaceState(previous => ({
             ...previous,
             providerErrors: {
               ...previous.providerErrors,
@@ -615,7 +646,7 @@ export function PluginsWorkspace({
           }))
         })
         .finally(() => {
-          setMcpMarketplaceState((previous) => ({
+          setMcpMarketplaceState(previous => ({
             ...previous,
             providerLoadingByKey: {
               ...previous.providerLoadingByKey,
@@ -624,13 +655,10 @@ export function PluginsWorkspace({
           }))
         })
     },
-    [mcpApi],
+    [mcpApi]
   )
 
-  const installProviderServer = (
-    provider: MCPProviderInfo,
-    server: MCPServer,
-  ) => {
+  const installProviderServer = (provider: MCPProviderInfo, server: MCPServer) => {
     mcpApi
       .installProviderMcp({
         providerKey: provider.key,
@@ -641,48 +669,43 @@ export function PluginsWorkspace({
         server: serverConfigFromProviderServer(server),
         sourcePayload: server as unknown as Record<string, unknown>,
       })
-      .then((item) => {
-        setMcpMarketplaceState((previous) => ({
+      .then(item => {
+        setMcpMarketplaceState(previous => ({
           ...previous,
           providerServers: {
             ...previous.providerServers,
-            [provider.key]: (previous.providerServers[provider.key] ?? []).map(
-              (candidate) =>
-                candidate.id === server.id
-                  ? {
-                      ...candidate,
-                      installState: 'installed',
-                      installedMcpId: getKindIdFromMetadata(item.metadata),
-                      enabled: item.spec.enabled,
-                    }
-                  : candidate,
+            [provider.key]: (previous.providerServers[provider.key] ?? []).map(candidate =>
+              candidate.id === server.id
+                ? {
+                    ...candidate,
+                    installState: 'installed',
+                    installedMcpId: getKindIdFromMetadata(item.metadata),
+                    enabled: item.spec.enabled,
+                  }
+                : candidate
             ),
           },
         }))
       })
   }
 
-  const uninstallProviderServer = (
-    provider: MCPProviderInfo,
-    server: MCPServer,
-  ) => {
+  const uninstallProviderServer = (provider: MCPProviderInfo, server: MCPServer) => {
     if (!server.installedMcpId) return
 
     mcpApi.uninstallInstalledMcp(server.installedMcpId).then(() => {
-      setMcpMarketplaceState((previous) => ({
+      setMcpMarketplaceState(previous => ({
         ...previous,
         providerServers: {
           ...previous.providerServers,
-          [provider.key]: (previous.providerServers[provider.key] ?? []).map(
-            (candidate) =>
-              candidate.id === server.id
-                ? {
-                    ...candidate,
-                    installState: 'not_installed',
-                    installedMcpId: null,
-                    enabled: false,
-                  }
-                : candidate,
+          [provider.key]: (previous.providerServers[provider.key] ?? []).map(candidate =>
+            candidate.id === server.id
+              ? {
+                  ...candidate,
+                  installState: 'not_installed',
+                  installedMcpId: null,
+                  enabled: false,
+                }
+              : candidate
           ),
         },
       }))
@@ -721,27 +744,19 @@ export function PluginsWorkspace({
         : null
       const catalogItem = toPersonalCatalogItem(
         uploaded,
-        installed
-          ? new Map([[getInstalledSkillKey(installed), installed]])
-          : new Map(),
+        installed ? new Map([[getInstalledSkillKey(installed), installed]]) : new Map()
       )
-      setPersonalSkillState((previous) => ({
+      setPersonalSkillState(previous => ({
         ...previous,
-        items: [
-          catalogItem,
-          ...previous.items.filter((item) => item.id !== catalogItem.id),
-        ],
+        items: [catalogItem, ...previous.items.filter(item => item.id !== catalogItem.id)],
         error: null,
       }))
       setSectionFilter('personal')
       setShowSkillUploadDialog(false)
     } catch (error) {
-      setPersonalSkillState((previous) => ({
+      setPersonalSkillState(previous => ({
         ...previous,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to upload personal skill',
+        error: error instanceof Error ? error.message : 'Failed to upload personal skill',
       }))
       throw error
     } finally {
@@ -749,60 +764,70 @@ export function PluginsWorkspace({
     }
   }
 
-  const uploadPlugin = async (file: File) => {
-    setIsUploadingPlugin(true)
-    setPluginUploadError(null)
-    try {
-      const uploaded = await pluginApi.uploadPlugin(file)
-      const item = toInstalledPluginItem(uploaded)
-      setInstalledPlugins((previous) => [
-        item,
-        ...previous.filter((plugin) => plugin.id !== item.id),
-      ])
-      setActiveTab('plugins')
-      setShowPluginUploadDialog(false)
-    } catch (error) {
-      setPluginUploadError(
-        error instanceof Error ? error.message : 'Failed to upload plugin',
-      )
-      throw error
-    } finally {
-      setIsUploadingPlugin(false)
-    }
+  const updateCatalogAfterInstall = (
+    systemPluginId: number,
+    response: InstalledPluginListResponse
+  ) => {
+    const items = response.items.map(toInstalledPluginItem)
+    const installedIds = new Set(items.map(item => item.id))
+    const installedPluginIds = Object.fromEntries(
+      items.map(item => [item.raw.spec.runtime, item.id])
+    )
+    const primaryItem =
+      items.find(item => item.raw.spec.runtime === 'claudecode') ?? items[0] ?? null
+
+    setInstalledPlugins(previous => [
+      ...items,
+      ...previous.filter(plugin => !installedIds.has(plugin.id)),
+    ])
+    setPluginCatalogState(previous => ({
+      ...previous,
+      items: previous.items.map(plugin =>
+        plugin.id === systemPluginId
+          ? {
+              ...plugin,
+              installState: 'installed',
+              installedPluginId: primaryItem?.id ?? plugin.installedPluginId ?? null,
+              installedPluginIds,
+              installedChecksum: plugin.sourceChecksum,
+            }
+          : plugin
+      ),
+    }))
+  }
+
+  const installCatalogPlugin = async (plugin: PluginCatalogItem) => {
+    const installed = await pluginApi.installSystemPlugin(plugin.id)
+    updateCatalogAfterInstall(plugin.id, installed)
+  }
+
+  const updateCatalogPlugin = async (plugin: PluginCatalogItem) => {
+    const installed = await pluginApi.updateSystemPlugin(plugin.id)
+    updateCatalogAfterInstall(plugin.id, installed)
   }
 
   const toggleInstalledPlugin = (id: number) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
-    setInstalledPlugins((previous) =>
-      previous.map((item) =>
-        item.id === id ? { ...item, enabled: !item.enabled } : item,
-      ),
+    setInstalledPlugins(previous =>
+      previous.map(item => (item.id === id ? { ...item, enabled: !item.enabled } : item))
     )
-    pluginApi
-      .updateInstalledPlugin(id, { enabled: !plugin.enabled })
-      .catch(() => {
-        setInstalledPlugins((previous) =>
-          previous.map((item) =>
-            item.id === id ? { ...item, enabled: plugin.enabled } : item,
-          ),
-        )
-      })
+    pluginApi.updateInstalledPlugin(id, { enabled: !plugin.enabled }).catch(() => {
+      setInstalledPlugins(previous =>
+        previous.map(item => (item.id === id ? { ...item, enabled: plugin.enabled } : item))
+      )
+    })
   }
 
-  const togglePluginComponent = (
-    id: number,
-    componentKey: string,
-    enabled: boolean,
-  ) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+  const togglePluginComponent = (id: number, componentKey: string, enabled: boolean) => {
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
     const previousStates = plugin.raw.spec.componentStates || {}
     const nextStates = { ...previousStates, [componentKey]: enabled }
-    setInstalledPlugins((previous) =>
-      previous.map((item) =>
+    setInstalledPlugins(previous =>
+      previous.map(item =>
         item.id === id
           ? {
               ...item,
@@ -814,34 +839,30 @@ export function PluginsWorkspace({
                 },
               },
             }
-          : item,
-      ),
+          : item
+      )
     )
     pluginApi
       .updateInstalledPlugin(id, {
         componentStates: { [componentKey]: enabled },
       })
-      .then((updated) => {
+      .then(updated => {
         const nextItem = toInstalledPluginItem(updated)
-        setInstalledPlugins((previous) =>
-          previous.map((item) => (item.id === id ? nextItem : item)),
-        )
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? nextItem : item)))
       })
       .catch(() => {
-        setInstalledPlugins((previous) =>
-          previous.map((item) => (item.id === id ? plugin : item)),
-        )
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? plugin : item)))
       })
   }
 
   const uninstallInstalledPlugin = (id: number) => {
-    const plugin = installedPlugins.find((item) => item.id === id)
+    const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
 
-    setInstalledPlugins((previous) => previous.filter((item) => item.id !== id))
-    setSelectedPluginId((current) => (current === id ? null : current))
+    setInstalledPlugins(previous => previous.filter(item => item.id !== id))
+    setSelectedPluginId(current => (current === id ? null : current))
     pluginApi.uninstallInstalledPlugin(id).catch(() => {
-      setInstalledPlugins((previous) => [...previous, plugin])
+      setInstalledPlugins(previous => [...previous, plugin])
     })
   }
 
@@ -850,7 +871,7 @@ export function PluginsWorkspace({
 
     let isCurrent = true
 
-    setSystemSkillState((previous) => ({
+    setSystemSkillState(previous => ({
       ...previous,
       isLoading: true,
       error: null,
@@ -863,7 +884,7 @@ export function PluginsWorkspace({
         pageSize: SYSTEM_SKILL_PAGE_SIZE,
         category: 'system',
       })
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
 
         setSystemSkillState({
@@ -876,7 +897,7 @@ export function PluginsWorkspace({
           error: null,
         })
       })
-      .catch((error) => {
+      .catch(error => {
         if (!isCurrent) return
 
         setSystemSkillState({
@@ -886,10 +907,7 @@ export function PluginsWorkspace({
           page: systemSkillPage,
           pageSize: SYSTEM_SKILL_PAGE_SIZE,
           isLoading: false,
-          error:
-            error instanceof Error
-              ? error.message
-              : 'Failed to load system skills',
+          error: error instanceof Error ? error.message : 'Failed to load system skills',
         })
       })
 
@@ -901,27 +919,24 @@ export function PluginsWorkspace({
   useEffect(() => {
     let isCurrent = true
 
-    setPersonalSkillState((previous) => ({
+    setPersonalSkillState(previous => ({
       ...previous,
       isLoading: true,
       error: null,
     }))
 
-    Promise.all([
-      systemSkillApi.listPersonalSkills(),
-      systemSkillApi.listInstalledSystemSkills(),
-    ])
+    Promise.all([systemSkillApi.listPersonalSkills(), systemSkillApi.listInstalledSystemSkills()])
       .then(([personalResponse, installedResponse]) => {
         if (!isCurrent) return
         const personalInstalled = installedResponse.items.filter(
-          (item) => item.spec.source.type === 'personal',
+          item => item.spec.source.type === 'personal'
         )
         const installedBySkillKey = new Map(
-          personalInstalled.map((item) => [getInstalledSkillKey(item), item]),
+          personalInstalled.map(item => [getInstalledSkillKey(item), item])
         )
         setPersonalSkillState({
-          items: personalResponse.items.map((item) =>
-            toPersonalCatalogItem(item, installedBySkillKey),
+          items: personalResponse.items.map(item =>
+            toPersonalCatalogItem(item, installedBySkillKey)
           ),
           isLoading: false,
           error: null,
@@ -945,7 +960,7 @@ export function PluginsWorkspace({
     if (activeTab !== 'mcp') return
 
     let isCurrent = true
-    setMcpMarketplaceState((previous) => ({
+    setMcpMarketplaceState(previous => ({
       ...previous,
       isLoading: true,
       error: null,
@@ -953,10 +968,10 @@ export function PluginsWorkspace({
 
     mcpApi
       .listProviders()
-      .then((response) => {
+      .then(response => {
         if (!isCurrent) return
 
-        setMcpMarketplaceState((previous) => ({
+        setMcpMarketplaceState(previous => ({
           ...previous,
           providers: response.providers,
           isLoading: false,
@@ -964,12 +979,12 @@ export function PluginsWorkspace({
         }))
 
         response.providers
-          .filter((provider) => !provider.requires_token || provider.has_token)
-          .forEach((provider) => loadMcpProviderServers(provider.key))
+          .filter(provider => !provider.requires_token || provider.has_token)
+          .forEach(provider => loadMcpProviderServers(provider.key))
       })
       .catch((error: Error) => {
         if (!isCurrent) return
-        setMcpMarketplaceState((previous) => ({
+        setMcpMarketplaceState(previous => ({
           ...previous,
           providers: [],
           isLoading: false,
@@ -984,19 +999,30 @@ export function PluginsWorkspace({
 
   useEffect(() => {
     let isCurrent = true
-    setIsLoadingPlugins(true)
+    setPluginCatalogState(previous => ({
+      ...previous,
+      isLoading: true,
+      error: null,
+    }))
 
-    pluginApi
-      .listInstalledPlugins()
-      .then((response) => {
+    Promise.all([pluginApi.listPluginCatalog(), pluginApi.listInstalledPlugins()])
+      .then(([catalogResponse, installedResponse]) => {
         if (!isCurrent) return
-        setInstalledPlugins(response.items.map(toInstalledPluginItem))
-        setIsLoadingPlugins(false)
+        setPluginCatalogState({
+          items: catalogResponse.items,
+          isLoading: false,
+          error: null,
+        })
+        setInstalledPlugins(installedResponse.items.map(toInstalledPluginItem))
       })
       .catch(() => {
         if (!isCurrent) return
+        setPluginCatalogState({
+          items: [],
+          isLoading: false,
+          error: 'Failed to load plugins',
+        })
         setInstalledPlugins([])
-        setIsLoadingPlugins(false)
       })
 
     return () => {
@@ -1006,9 +1032,8 @@ export function PluginsWorkspace({
 
   const filteredItems = useMemo(
     () =>
-      catalog.filter((item) => {
-        const sectionMatches =
-          sectionFilter === 'all' || item.section === sectionFilter
+      catalog.filter(item => {
+        const sectionMatches = sectionFilter === 'all' || item.section === sectionFilter
         const queryMatches =
           !normalizedQuery ||
           item.name.toLowerCase().includes(normalizedQuery) ||
@@ -1016,35 +1041,32 @@ export function PluginsWorkspace({
 
         return sectionMatches && queryMatches
       }),
-    [catalog, normalizedQuery, sectionFilter],
+    [catalog, normalizedQuery, sectionFilter]
   )
 
-  const filteredInstalledPlugins = useMemo(
+  const filteredPluginCatalog = useMemo(
     () =>
-      installedPlugins.filter((plugin) => {
+      pluginCatalogState.items.filter(plugin => {
         if (!normalizedQuery) return true
         return (
-          plugin.name.toLowerCase().includes(normalizedQuery) ||
+          plugin.displayName.toLowerCase().includes(normalizedQuery) ||
           plugin.description.toLowerCase().includes(normalizedQuery) ||
-          Object.keys(plugin.componentCounts).some((key) =>
-            key.toLowerCase().includes(normalizedQuery),
-          )
+          plugin.name.toLowerCase().includes(normalizedQuery)
         )
       }),
-    [installedPlugins, normalizedQuery],
+    [pluginCatalogState.items, normalizedQuery]
   )
   const selectedPlugin = useMemo(
     () =>
       selectedPluginId === null
         ? null
-        : (installedPlugins.find((plugin) => plugin.id === selectedPluginId) ??
-          null),
-    [installedPlugins, selectedPluginId],
+        : (installedPlugins.find(plugin => plugin.id === selectedPluginId) ?? null),
+    [installedPlugins, selectedPluginId]
   )
 
   const filteredMcpProviders = useMemo(
     () =>
-      mcpMarketplaceState.providers.filter((provider) => {
+      mcpMarketplaceState.providers.filter(provider => {
         if (!normalizedQuery) return true
 
         return (
@@ -1053,53 +1075,37 @@ export function PluginsWorkspace({
           provider.description.toLowerCase().includes(normalizedQuery) ||
           provider.key.toLowerCase().includes(normalizedQuery) ||
           (mcpMarketplaceState.providerServers[provider.key] ?? []).some(
-            (server) =>
+            server =>
               server.name.toLowerCase().includes(normalizedQuery) ||
-              (server.description ?? '')
-                .toLowerCase()
-                .includes(normalizedQuery),
+              (server.description ?? '').toLowerCase().includes(normalizedQuery)
           )
         )
       }),
-    [
-      mcpMarketplaceState.providers,
-      mcpMarketplaceState.providerServers,
-      normalizedQuery,
-    ],
+    [mcpMarketplaceState.providers, mcpMarketplaceState.providerServers, normalizedQuery]
   )
   const filteredMcpProviderServers = useMemo(() => {
     if (!normalizedQuery) return mcpMarketplaceState.providerServers
 
     return Object.fromEntries(
-      Object.entries(mcpMarketplaceState.providerServers).map(
-        ([providerKey, servers]) => [
-          providerKey,
-          mcpMarketplaceState.providers.some(
-            (provider) =>
-              provider.key === providerKey &&
-              (provider.name.toLowerCase().includes(normalizedQuery) ||
-                (provider.name_en ?? '')
-                  .toLowerCase()
-                  .includes(normalizedQuery) ||
-                provider.description.toLowerCase().includes(normalizedQuery) ||
-                provider.key.toLowerCase().includes(normalizedQuery)),
-          )
-            ? servers
-            : servers.filter(
-                (server) =>
-                  server.name.toLowerCase().includes(normalizedQuery) ||
-                  (server.description ?? '')
-                    .toLowerCase()
-                    .includes(normalizedQuery),
-              ),
-        ],
-      ),
+      Object.entries(mcpMarketplaceState.providerServers).map(([providerKey, servers]) => [
+        providerKey,
+        mcpMarketplaceState.providers.some(
+          provider =>
+            provider.key === providerKey &&
+            (provider.name.toLowerCase().includes(normalizedQuery) ||
+              (provider.name_en ?? '').toLowerCase().includes(normalizedQuery) ||
+              provider.description.toLowerCase().includes(normalizedQuery) ||
+              provider.key.toLowerCase().includes(normalizedQuery))
+        )
+          ? servers
+          : servers.filter(
+              server =>
+                server.name.toLowerCase().includes(normalizedQuery) ||
+                (server.description ?? '').toLowerCase().includes(normalizedQuery)
+            ),
+      ])
     )
-  }, [
-    mcpMarketplaceState.providerServers,
-    mcpMarketplaceState.providers,
-    normalizedQuery,
-  ])
+  }, [mcpMarketplaceState.providerServers, mcpMarketplaceState.providers, normalizedQuery])
   const systemSkillPagination =
     activeTab === 'skills' &&
     !systemSkillState.isLoading &&
@@ -1113,7 +1119,7 @@ export function PluginsWorkspace({
           type="button"
           data-testid="system-skills-previous-page-button"
           disabled={!canGoToPreviousSkillPage}
-          onClick={() => setSystemSkillPage((page) => Math.max(1, page - 1))}
+          onClick={() => setSystemSkillPage(page => Math.max(1, page - 1))}
           className="h-11 rounded-lg px-3 font-semibold text-text-secondary hover:bg-surface hover:text-text-primary disabled:cursor-not-allowed disabled:opacity-35 disabled:hover:bg-transparent disabled:hover:text-text-secondary"
         >
           {t('workbench.plugins_previous_page', '上一页')}
@@ -1125,7 +1131,7 @@ export function PluginsWorkspace({
           type="button"
           data-testid="system-skills-next-page-button"
           disabled={!canGoToNextSkillPage}
-          onClick={() => setSystemSkillPage((page) => page + 1)}
+          onClick={() => setSystemSkillPage(page => page + 1)}
           className="h-11 rounded-lg px-3 font-semibold text-text-secondary hover:bg-surface hover:text-text-primary disabled:cursor-not-allowed disabled:opacity-35 disabled:hover:bg-transparent disabled:hover:text-text-secondary"
         >
           {t('workbench.plugins_next_page', '下一页')}
@@ -1159,7 +1165,7 @@ export function PluginsWorkspace({
             'mx-auto h-12 max-w-[1420px] pl-20 pr-5 md:h-[52px] md:pr-7',
             sidebarCollapsed ? 'md:pl-6' : 'md:pl-7',
           ].join(' ')}
-          left={(
+          left={
             <>
               {topBarLeftActions}
               <div
@@ -1204,9 +1210,9 @@ export function PluginsWorkspace({
                 </button>
               </div>
             </>
-          )}
+          }
           dragRegionClassName="hidden md:block"
-          right={(
+          right={
             <div className="hidden items-center gap-5 overflow-visible md:flex">
               <button
                 type="button"
@@ -1220,7 +1226,7 @@ export function PluginsWorkspace({
               {!isMobile && (
                 <PluginCreateMenu
                   isOpen={isCreateMenuOpen}
-                  onToggle={() => setIsCreateMenuOpen((previous) => !previous)}
+                  onToggle={() => setIsCreateMenuOpen(previous => !previous)}
                   onCreateSkill={() => {
                     setIsCreateMenuOpen(false)
                     setShowSkillUploadDialog(true)
@@ -1229,11 +1235,6 @@ export function PluginsWorkspace({
                     setIsCreateMenuOpen(false)
                     setShowCustomMcpDialog(true)
                   }}
-                  onCreatePlugin={() => {
-                    setIsCreateMenuOpen(false)
-                    setPluginUploadError(null)
-                    setShowPluginUploadDialog(true)
-                  }}
                 />
               )}
               <button
@@ -1244,7 +1245,7 @@ export function PluginsWorkspace({
                 <MoreHorizontal />
               </button>
             </div>
-          )}
+          }
         />
       </div>
 
@@ -1264,7 +1265,7 @@ export function PluginsWorkspace({
               <Search className="pointer-events-none absolute left-4 top-1/2 h-4 w-4 -translate-y-1/2 text-text-muted" />
               <input
                 value={query}
-                onChange={(event) => {
+                onChange={event => {
                   setQuery(event.target.value)
                   setSystemSkillPage(1)
                 }}
@@ -1284,7 +1285,7 @@ export function PluginsWorkspace({
                 <PluginCreateMenu
                   compact
                   isOpen={isCreateMenuOpen}
-                  onToggle={() => setIsCreateMenuOpen((previous) => !previous)}
+                  onToggle={() => setIsCreateMenuOpen(previous => !previous)}
                   onCreateSkill={() => {
                     setIsCreateMenuOpen(false)
                     setShowSkillUploadDialog(true)
@@ -1293,11 +1294,6 @@ export function PluginsWorkspace({
                     setIsCreateMenuOpen(false)
                     setShowCustomMcpDialog(true)
                   }}
-                  onCreatePlugin={() => {
-                    setIsCreateMenuOpen(false)
-                    setPluginUploadError(null)
-                    setShowPluginUploadDialog(true)
-                  }}
                 />
               </div>
             )}
@@ -1308,7 +1304,7 @@ export function PluginsWorkspace({
                 className="scrollbar-none -mx-1 flex gap-2 overflow-x-auto px-1 md:hidden"
                 data-testid="plugins-mobile-section-filter"
               >
-                {(['all', ...sections] as const).map((section) => (
+                {(['all', ...sections] as const).map(section => (
                   <button
                     key={section}
                     type="button"
@@ -1335,25 +1331,13 @@ export function PluginsWorkspace({
               <select
                 value={sectionFilter}
                 data-testid="plugins-section-filter"
-                onChange={(event) =>
-                  setSectionFilter(
-                    event.target.value as CatalogSectionId | 'all',
-                  )
-                }
+                onChange={event => setSectionFilter(event.target.value as CatalogSectionId | 'all')}
                 className="hidden h-10 rounded-xl border-0 bg-surface px-4 text-sm font-semibold text-text-primary outline-none md:block"
               >
-                <option value="all">
-                  {t('workbench.plugins_filter_all', '全部')}
-                </option>
-                <option value="recommended">
-                  {t('workbench.plugins_recommended', '推荐')}
-                </option>
-                <option value="system">
-                  {t('workbench.plugins_system', '系统')}
-                </option>
-                <option value="personal">
-                  {t('workbench.plugins_personal', '个人')}
-                </option>
+                <option value="all">{t('workbench.plugins_filter_all', '全部')}</option>
+                <option value="recommended">{t('workbench.plugins_recommended', '推荐')}</option>
+                <option value="system">{t('workbench.plugins_system', '系统')}</option>
+                <option value="personal">{t('workbench.plugins_personal', '个人')}</option>
               </select>
             </>
           )}
@@ -1377,42 +1361,31 @@ export function PluginsWorkspace({
               }
             />
           ) : activeTab === 'plugins' ? (
-            isLoadingPlugins ? (
+            pluginCatalogState.isLoading ? (
               <div className="flex min-h-[220px] items-center justify-center text-sm font-semibold text-text-secondary">
                 {t('workbench.plugins_loading_plugins', '正在加载插件')}
               </div>
-            ) : filteredInstalledPlugins.length === 0 ? (
+            ) : pluginCatalogState.error ? (
+              <div className="flex min-h-[220px] items-center justify-center text-sm font-semibold text-text-secondary">
+                {t('workbench.plugins_load_failed', '加载插件失败')}
+              </div>
+            ) : filteredPluginCatalog.length === 0 ? (
               <div className="flex min-h-[220px] flex-col items-center justify-center gap-3 text-sm font-semibold">
                 <div className="text-text-secondary">
-                  {t(
-                    'workbench.plugins_no_installed_plugins',
-                    '暂无已安装插件',
-                  )}
+                  {t('workbench.plugins_no_available_plugins')}
                 </div>
-                <button
-                  type="button"
-                  data-testid="plugins-upload-empty-button"
-                  className="rounded-xl bg-text-primary px-4 py-2 text-background hover:bg-text-primary/90"
-                  onClick={() => {
-                    setPluginUploadError(null)
-                    setShowPluginUploadDialog(true)
-                  }}
-                >
-                  {t(
-                    'workbench.plugins_plugin_upload_title',
-                    '上传 Claude Code 插件',
-                  )}
-                </button>
               </div>
             ) : (
               <div className="space-y-5">
-                {filteredInstalledPlugins.map((plugin) => (
-                  <InstalledPluginRow
+                {filteredPluginCatalog.map(plugin => (
+                  <SystemPluginCatalogRow
                     key={plugin.id}
                     plugin={plugin}
-                    onOpen={() => setSelectedPluginId(plugin.id)}
-                    onToggle={() => toggleInstalledPlugin(plugin.id)}
-                    onUninstall={() => uninstallInstalledPlugin(plugin.id)}
+                    enabledLabel={t('workbench.plugins_enabled', '已启用')}
+                    installLabel={t('workbench.plugins_install', '安装')}
+                    updateLabel={t('workbench.plugins_update', '更新')}
+                    onInstall={() => void installCatalogPlugin(plugin)}
+                    onUpdate={() => void updateCatalogPlugin(plugin)}
                   />
                 ))}
               </div>
@@ -1432,10 +1405,8 @@ export function PluginsWorkspace({
               {t('workbench.plugins_no_search_results', '找不到匹配的技能')}
             </div>
           ) : (
-            sections.map((section) => {
-              const sectionItems = filteredItems.filter(
-                (item) => item.section === section,
-              )
+            sections.map(section => {
+              const sectionItems = filteredItems.filter(item => item.section === section)
               if (sectionItems.length === 0) return null
 
               const catalogSection = (
@@ -1463,15 +1434,11 @@ export function PluginsWorkspace({
               return <div key={section}>{catalogSection}</div>
             })
           )}
-          {activeTab === 'skills' &&
-            systemSkillState.providerErrors.length > 0 && (
-              <div className="text-xs text-text-muted">
-                {t(
-                  'workbench.plugins_provider_partial_error',
-                  '部分技能来源暂不可用',
-                )}
-              </div>
-            )}
+          {activeTab === 'skills' && systemSkillState.providerErrors.length > 0 && (
+            <div className="text-xs text-text-muted">
+              {t('workbench.plugins_provider_partial_error', '部分技能来源暂不可用')}
+            </div>
+          )}
           {activeTab === 'skills' && personalSkillState.error && (
             <div className="text-xs text-text-muted">
               {t('workbench.plugins_personal_skill_error', '个人技能暂不可用')}
@@ -1485,7 +1452,7 @@ export function PluginsWorkspace({
           title={t('workbench.plugins_uninstall_confirm_title', '卸载技能？')}
           description={t(
             'workbench.plugins_uninstall_confirm_description',
-            '卸载后可以随时重新安装。',
+            '卸载后可以随时重新安装。'
           )}
           cancelLabel={t('workbench.plugins_uninstall_cancel', '取消')}
           confirmLabel={t('workbench.plugins_uninstall_confirm', '卸载')}
@@ -1500,13 +1467,10 @@ export function PluginsWorkspace({
       {pendingUninstallMcp && (
         <ConfirmUninstallDialog
           item={{ name: pendingUninstallMcp.server.name }}
-          title={t(
-            'workbench.plugins_uninstall_mcp_confirm_title',
-            '卸载 MCP？',
-          )}
+          title={t('workbench.plugins_uninstall_mcp_confirm_title', '卸载 MCP？')}
           description={t(
             'workbench.plugins_uninstall_mcp_confirm_description',
-            '卸载后可以在市场中重新安装。',
+            '卸载后可以在市场中重新安装。'
           )}
           cancelLabel={t('workbench.plugins_uninstall_cancel', '取消')}
           confirmLabel={t('workbench.plugins_uninstall_confirm', '卸载')}
@@ -1524,7 +1488,7 @@ export function PluginsWorkspace({
           form={customMcpForm}
           isSubmitting={isCreatingCustomMcp}
           onCancel={() => setShowCustomMcpDialog(false)}
-          onChange={(nextForm) => setCustomMcpForm(nextForm)}
+          onChange={nextForm => setCustomMcpForm(nextForm)}
           onSubmit={createCustomMcp}
         />
       )}
@@ -1535,15 +1499,6 @@ export function PluginsWorkspace({
           onUpload={uploadPersonalSkill}
         />
       )}
-      {showPluginUploadDialog && (
-        <PluginUploadDialog
-          isUploading={isUploadingPlugin}
-          uploadError={pluginUploadError}
-          onCancel={() => setShowPluginUploadDialog(false)}
-          onErrorReset={() => setPluginUploadError(null)}
-          onUpload={uploadPlugin}
-        />
-      )}
     </main>
   )
 }
diff --git a/wework/src/i18n/locales/en/common.json b/wework/src/i18n/locales/en/common.json
index b33ba53e15..e755b39423 100644
--- a/wework/src/i18n/locales/en/common.json
+++ b/wework/src/i18n/locales/en/common.json
@@ -408,7 +408,6 @@
     "plugins_create": "Create",
     "plugins_create_skill": "Skill",
     "plugins_create_mcp": "MCP",
-    "plugins_create_plugin": "Plugin",
     "plugins_enabled": "Enabled",
     "plugins_disabled": "Disabled",
     "plugins_more_actions": "More actions",
@@ -416,6 +415,7 @@
     "plugins_loading_plugins": "Loading plugins",
     "plugins_no_installed_mcps": "No installed MCP",
     "plugins_no_installed_plugins": "No installed plugins",
+    "plugins_no_available_plugins": "No available plugins",
     "plugins_installed_mcps": "Installed MCP",
     "plugins_installed_mcps_description": "Global installs enter the device install inventory and can be enabled or uninstalled.",
     "plugins_mcp_providers": "MCP Providers",
@@ -453,15 +453,6 @@
     "plugins_skill_upload_author": "Author",
     "plugins_skill_upload_tags": "Tags",
     "plugins_skill_upload_confirm": "Upload",
-    "plugins_plugin_upload_title": "Upload Claude Code plugin",
-    "plugins_plugin_upload_description": "Choose a ZIP package containing .claude-plugin/plugin.json.",
-    "plugins_plugin_upload_drop_title": "Choose plugin ZIP",
-    "plugins_plugin_upload_hint": "Claude Code plugin ZIP, up to 50MB",
-    "plugins_plugin_upload_zip_error": "Choose a .zip plugin package",
-    "plugins_plugin_upload_size_error": "Plugin package must be 50MB or smaller",
-    "plugins_plugin_upload_select_file": "Choose a plugin package first",
-    "plugins_plugin_upload_failed": "Plugin upload failed",
-    "plugins_plugin_uploading": "Uploading",
     "plugin_detail_contents": "Contents",
     "plugin_detail_info": "Info",
     "plugin_detail_enabled": "Enabled",
diff --git a/wework/src/i18n/locales/zh-CN/common.json b/wework/src/i18n/locales/zh-CN/common.json
index 32155de9d6..45996f0cef 100644
--- a/wework/src/i18n/locales/zh-CN/common.json
+++ b/wework/src/i18n/locales/zh-CN/common.json
@@ -408,7 +408,6 @@
     "plugins_create": "创建",
     "plugins_create_skill": "技能",
     "plugins_create_mcp": "MCP",
-    "plugins_create_plugin": "插件",
     "plugins_enabled": "已启用",
     "plugins_disabled": "已停用",
     "plugins_more_actions": "更多操作",
@@ -416,6 +415,7 @@
     "plugins_loading_plugins": "正在加载插件",
     "plugins_no_installed_mcps": "暂无已安装 MCP",
     "plugins_no_installed_plugins": "暂无已安装插件",
+    "plugins_no_available_plugins": "暂无可用插件",
     "plugins_installed_mcps": "已安装 MCP",
     "plugins_installed_mcps_description": "全局安装后会进入设备安装清单，可单独启用或卸载。",
     "plugins_mcp_providers": "MCP 供应商",
@@ -453,15 +453,6 @@
     "plugins_skill_upload_author": "作者",
     "plugins_skill_upload_tags": "标签",
     "plugins_skill_upload_confirm": "上传",
-    "plugins_plugin_upload_title": "上传 Claude Code 插件",
-    "plugins_plugin_upload_description": "选择包含 .claude-plugin/plugin.json 的 ZIP 包。",
-    "plugins_plugin_upload_drop_title": "选择插件 ZIP 包",
-    "plugins_plugin_upload_hint": "支持 Claude Code 插件 ZIP，最大 50MB",
-    "plugins_plugin_upload_zip_error": "请选择 .zip 插件包",
-    "plugins_plugin_upload_size_error": "插件安装包不能超过 50MB",
-    "plugins_plugin_upload_select_file": "请先选择插件包",
-    "plugins_plugin_upload_failed": "插件上传失败",
-    "plugins_plugin_uploading": "上传中",
     "plugin_detail_contents": "包含内容",
     "plugin_detail_info": "信息",
     "plugin_detail_enabled": "已启用",
diff --git a/wework/src/types/api.ts b/wework/src/types/api.ts
index 06c0633777..c20772614b 100644
--- a/wework/src/types/api.ts
+++ b/wework/src/types/api.ts
@@ -1151,12 +1151,16 @@ export interface InstalledPluginComponents {
   settings?: Record<string, unknown> | null
 }
 
+export type PluginRuntime = 'claudecode' | 'codex'
+
 export interface InstalledPluginSource {
-  type: 'upload' | 'marketplace' | 'local'
+  type: 'upload' | 'marketplace' | 'local' | 'system'
   providerKey: string
   pluginKey: string
   catalogItemId?: string | null
   marketplace?: string | null
+  systemPluginId?: number | null
+  runtime?: PluginRuntime | null
 }
 
 export interface InstalledPluginPackageRef {
@@ -1175,6 +1179,7 @@ export interface InstalledPlugin {
     description: string
     version?: string | null
     author?: string | null
+    runtime: PluginRuntime
     installState: PluginInstallState
     enabled: boolean
     componentStates?: Record<string, boolean>
@@ -1192,6 +1197,27 @@ export interface InstalledPluginListResponse {
   items: InstalledPlugin[]
 }
 
+export interface PluginCatalogItem {
+  id: number
+  name: string
+  displayName: string
+  description: string
+  version?: string | null
+  author?: string | null
+  enabled: boolean
+  installState: PluginInstallState
+  installedPluginId?: number | null
+  installedPluginIds?: Partial<Record<PluginRuntime, number>>
+  variantIds?: Partial<Record<PluginRuntime, number>>
+  sourceChecksum?: string | null
+  installedChecksum?: string | null
+  components: InstalledPluginComponents
+}
+
+export interface PluginCatalogListResponse {
+  items: PluginCatalogItem[]
+}
+
 export interface InstalledPluginUpdateRequest {
   enabled?: boolean
   componentStates?: Record<string, boolean>

From 90a87d3cad12b684362fcc03641184cdc662056f Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:28:10 +0800
Subject: [PATCH 2/8] fix: use primary color for system plugin icon

---
 wework/src/components/plugins/PluginsWorkspace.test.tsx | 4 ++++
 wework/src/components/plugins/PluginsWorkspace.tsx      | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index 9b1a111e14..5e17fbfcd2 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -523,6 +523,10 @@ describe('PluginsWorkspace', () => {
 
     expect(await screen.findByText('Superpowers')).toBeInTheDocument()
     expect(screen.getByText('System managed plugin')).toBeInTheDocument()
+    expect(screen.getByTestId('system-plugin-icon-100')).toHaveClass(
+      'bg-primary/10',
+      'text-primary'
+    )
     expect(screen.queryByText('上传 Claude Code 插件')).not.toBeInTheDocument()
 
     await userEvent.click(screen.getByTestId('plugins-create-button'))
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index dfdbe876bb..e5ea98a5eb 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -356,7 +356,10 @@ function SystemPluginCatalogRow({
 
   return (
     <article className="group flex min-h-[84px] items-center gap-3 rounded-2xl border border-border/70 bg-background px-3 py-3 shadow-sm hover:bg-surface sm:min-h-[74px] sm:gap-4 sm:rounded-lg sm:border-0 sm:bg-transparent sm:py-2 sm:shadow-none">
-      <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-violet-50 text-violet-600">
+      <div
+        className="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-primary/10 text-primary"
+        data-testid={`system-plugin-icon-${safeId}`}
+      >
         <Boxes className="h-6 w-6" />
       </div>
       <div className="min-w-0 flex-1">

From b385253514a82191a614a4034c6f9aa47f8ee47b Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:33:36 +0800
Subject: [PATCH 3/8] fix: remove plugin marketplace hero

---
 .../plugins/PluginsWorkspace.test.tsx         |  2 +
 .../components/plugins/PluginsWorkspace.tsx   | 42 -------------------
 wework/src/i18n/locales/en/common.json        |  2 -
 wework/src/i18n/locales/zh-CN/common.json     |  2 -
 4 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index 5e17fbfcd2..078b2bdedb 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -523,6 +523,8 @@ describe('PluginsWorkspace', () => {
 
     expect(await screen.findByText('Superpowers')).toBeInTheDocument()
     expect(screen.getByText('System managed plugin')).toBeInTheDocument()
+    expect(screen.queryByText('帮我整理本周的项目进度并生成可视化报告')).not.toBeInTheDocument()
+    expect(screen.queryByText('在对话中试用')).not.toBeInTheDocument()
     expect(screen.getByTestId('system-plugin-icon-100')).toHaveClass(
       'bg-primary/10',
       'text-primary'
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index e5ea98a5eb..76cd8e4015 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -3,7 +3,6 @@ import {
   BookOpen,
   Check,
   ImageIcon,
-  MessageCircle,
   MoreHorizontal,
   Plus,
   RefreshCw,
@@ -294,45 +293,6 @@ function tabClassName(selected: boolean) {
   ].join(' ')
 }
 
-function MarketplaceHero() {
-  const { t } = useTranslation('common')
-
-  return (
-    <section className="relative z-0 flex min-h-[190px] w-full overflow-hidden rounded-2xl bg-surface shadow-[0_14px_38px_rgba(104,117,179,0.16)] md:min-h-[220px]">
-      <div className="absolute inset-0 bg-[radial-gradient(circle_at_16%_20%,rgba(255,255,255,0.95),transparent_31%),radial-gradient(circle_at_82%_24%,rgba(226,215,255,0.95),transparent_34%),linear-gradient(135deg,#b9c9ff_0%,#eef4ff_38%,#d8d4ff_68%,#b8c3ff_100%)]" />
-      <div className="absolute -left-16 top-4 h-[360px] w-[520px] rotate-[-20deg] rounded-[50%] border border-white/45 bg-white/22 blur-[2px]" />
-      <div className="absolute -right-10 bottom-[-120px] h-[360px] w-[600px] rotate-[-8deg] rounded-[50%] border border-white/35 bg-white/18 blur-[2px]" />
-      <div className="absolute inset-0 bg-[linear-gradient(120deg,rgba(255,255,255,0.34),transparent_45%,rgba(255,255,255,0.18))]" />
-      <div className="relative z-0 flex min-h-full w-full flex-col items-center justify-center gap-7 px-6 py-8 text-center">
-        <div className="inline-flex max-w-full items-center gap-2.5 rounded-xl border border-background/70 bg-background/80 px-4 py-2.5 text-sm font-semibold leading-5 text-text-primary shadow-[0_10px_32px_rgba(82,88,132,0.18)] backdrop-blur-md">
-          <Sparkles className="h-4 w-4 shrink-0 text-primary" />
-          <span className="truncate">
-            {t('workbench.plugins_hero_prompt', '帮我整理本周的项目进度并生成可视化报告')}
-          </span>
-        </div>
-        <button
-          type="button"
-          className="inline-flex h-11 items-center gap-2.5 rounded-lg bg-text-primary px-5 text-sm font-semibold leading-5 text-background shadow-[0_14px_24px_rgba(0,0,0,0.20)] transition-transform hover:-translate-y-0.5"
-        >
-          <MessageCircle className="h-5 w-5" />
-          {t('workbench.plugins_hero_cta', '在对话中试用')}
-        </button>
-      </div>
-      <div className="absolute right-7 top-1/2 z-0 flex -translate-y-1/2 flex-col gap-3">
-        {[0, 1, 2, 3, 4].map(dot => (
-          <span
-            key={dot}
-            className={[
-              'h-2.5 w-2.5 rounded-full',
-              dot === 0 ? 'bg-text-primary' : 'bg-text-primary/25',
-            ].join(' ')}
-          />
-        ))}
-      </div>
-    </section>
-  )
-}
-
 function SystemPluginCatalogRow({
   plugin,
   installLabel,
@@ -1346,8 +1306,6 @@ export function PluginsWorkspace({
           )}
         </div>
 
-        <MarketplaceHero />
-
         <section className="space-y-8">
           {activeTab === 'mcp' ? (
             <McpMarketplaceCatalog
diff --git a/wework/src/i18n/locales/en/common.json b/wework/src/i18n/locales/en/common.json
index d3d518de70..bbec3a6fda 100644
--- a/wework/src/i18n/locales/en/common.json
+++ b/wework/src/i18n/locales/en/common.json
@@ -384,8 +384,6 @@
     "plugins_tab": "Plugins",
     "skills_tab": "Skills",
     "plugins_title": "Let Wework Work Your Way",
-    "plugins_hero_prompt": "Summarize this week's project progress and create a visual report",
-    "plugins_hero_cta": "Try in chat",
     "plugins_search_placeholder": "Search skills",
     "plugins_search_plugins": "Search plugins",
     "plugins_search_mcp": "Search MCP",
diff --git a/wework/src/i18n/locales/zh-CN/common.json b/wework/src/i18n/locales/zh-CN/common.json
index 81fa53668a..0f840faaaa 100644
--- a/wework/src/i18n/locales/zh-CN/common.json
+++ b/wework/src/i18n/locales/zh-CN/common.json
@@ -384,8 +384,6 @@
     "plugins_tab": "插件",
     "skills_tab": "技能",
     "plugins_title": "让 Wework 按你的方式工作",
-    "plugins_hero_prompt": "帮我整理本周的项目进度并生成可视化报告",
-    "plugins_hero_cta": "在对话中试用",
     "plugins_search_placeholder": "搜索技能",
     "plugins_search_plugins": "搜索插件",
     "plugins_search_mcp": "搜索 MCP",

From 66995f9736e34f4bd87bf8a4b9e315619897c8cb Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:41:00 +0800
Subject: [PATCH 4/8] fix: group installed plugin variants

---
 .../plugins/PluginManagementRows.tsx          |  26 ++--
 .../PluginManagementWorkspace.test.tsx        |  93 +++++++++++-
 .../plugins/PluginManagementWorkspace.tsx     | 141 ++++++++++++++----
 .../components/plugins/PluginsWorkspace.tsx   |   2 +
 4 files changed, 211 insertions(+), 51 deletions(-)

diff --git a/wework/src/components/plugins/PluginManagementRows.tsx b/wework/src/components/plugins/PluginManagementRows.tsx
index ca9755250f..37a5173a0a 100644
--- a/wework/src/components/plugins/PluginManagementRows.tsx
+++ b/wework/src/components/plugins/PluginManagementRows.tsx
@@ -20,12 +20,14 @@ export interface InstalledMcpItem {
 
 export interface InstalledPluginItem {
   id: number
+  ids: number[]
   name: string
   description: string
   enabled: boolean
   version?: string | null
   componentCounts: Record<string, number>
   raw: InstalledPlugin
+  rawVariants: InstalledPlugin[]
 }
 
 export function InstalledSkillRow({
@@ -45,9 +47,7 @@ export function InstalledSkillRow({
         <Sparkles className="h-7 w-7" />
       </div>
       <div className="min-w-0">
-        <h2 className="truncate text-[17px] font-semibold leading-6">
-          {skill.name}
-        </h2>
+        <h2 className="truncate text-[17px] font-semibold leading-6">{skill.name}</h2>
         <p className="mt-1 truncate text-[15px] leading-6 text-text-secondary">
           {skill.description}
         </p>
@@ -104,16 +104,12 @@ export function InstalledMcpRow({
       </div>
       <div className="min-w-0">
         <div className="flex min-w-0 items-center gap-2">
-          <h2 className="truncate text-[17px] font-semibold leading-6">
-            {mcp.name}
-          </h2>
+          <h2 className="truncate text-[17px] font-semibold leading-6">{mcp.name}</h2>
           <span className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted">
             {mcp.serverType}
           </span>
         </div>
-        <p className="mt-1 truncate text-[15px] leading-6 text-text-secondary">
-          {mcp.description}
-        </p>
+        <p className="mt-1 truncate text-[15px] leading-6 text-text-secondary">{mcp.description}</p>
       </div>
       <div className="flex items-center justify-end gap-3">
         <button
@@ -172,7 +168,7 @@ export function InstalledPluginRow({
       data-testid={`installed-plugin-row-${plugin.id}`}
       className="grid cursor-pointer grid-cols-[64px_minmax(0,1fr)_112px] items-center gap-4 rounded-xl transition-colors hover:bg-surface/70"
       onClick={onOpen}
-      onKeyDown={(event) => {
+      onKeyDown={event => {
         if (!onOpen) return
         if (event.key === 'Enter' || event.key === ' ') {
           event.preventDefault()
@@ -185,9 +181,7 @@ export function InstalledPluginRow({
       </div>
       <div className="min-w-0">
         <div className="flex min-w-0 items-center gap-2">
-          <h2 className="truncate text-[17px] font-semibold leading-6">
-            {plugin.name}
-          </h2>
+          <h2 className="truncate text-[17px] font-semibold leading-6">{plugin.name}</h2>
           {plugin.version && (
             <span className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted">
               {plugin.version}
@@ -199,7 +193,7 @@ export function InstalledPluginRow({
         </p>
         {componentLabels.length > 0 && (
           <div className="mt-2 flex flex-wrap gap-1.5">
-            {componentLabels.map((label) => (
+            {componentLabels.map(label => (
               <span
                 key={label}
                 className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted"
@@ -216,7 +210,7 @@ export function InstalledPluginRow({
           aria-label={t('workbench.plugins_uninstall', '卸载')}
           data-testid={`installed-plugin-uninstall-${plugin.id}`}
           className="flex h-9 w-9 items-center justify-center rounded-lg text-text-muted transition-colors hover:bg-surface hover:text-red-500"
-          onClick={(event) => {
+          onClick={event => {
             event.stopPropagation()
             onUninstall()
           }}
@@ -233,7 +227,7 @@ export function InstalledPluginRow({
             'relative h-7 w-12 rounded-full transition-colors',
             plugin.enabled ? 'bg-blue-500' : 'bg-border',
           ].join(' ')}
-          onClick={(event) => {
+          onClick={event => {
             event.stopPropagation()
             onToggle()
           }}
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.test.tsx b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
index 859e439cb1..ad92f2ff5a 100644
--- a/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
@@ -3,17 +3,76 @@ import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 import '@/i18n'
 import { PluginManagementWorkspace } from './PluginManagementWorkspace'
+import type { InstalledPlugin } from '@/types/api'
 
-function mockManagementFetch() {
+function makeInstalledPlugin(id: number, runtime: 'claudecode' | 'codex'): InstalledPlugin {
+  return {
+    apiVersion: 'agent.wecode.io/v1',
+    kind: 'InstalledPlugin',
+    metadata: {
+      name: `superpowers-${runtime}`,
+      namespace: 'default',
+      labels: { id: String(id) },
+    },
+    spec: {
+      source: {
+        type: 'system',
+        providerKey: runtime === 'codex' ? 'codex' : 'claude-code',
+        pluginKey: 'superpowers',
+        catalogItemId: '100',
+        systemPluginId: runtime === 'codex' ? 101 : 100,
+        runtime,
+      },
+      displayName: 'superpowers',
+      description:
+        'Core skills library for Claude Code: TDD, debugging, collaboration patterns, and proven techniques',
+      version: '5.0.7',
+      runtime,
+      installState: 'installed',
+      enabled: true,
+      componentStates: {},
+      manifest: { name: 'superpowers' },
+      components: {
+        skills: [{ name: 'plan', description: 'Plan work', path: 'skills/plan/SKILL.md' }],
+        commands: [{ name: 'test', path: 'commands/test.md' }],
+        agents: [],
+        hooks: [],
+        mcps: [],
+        lsps: [],
+        monitors: [],
+        bins: [],
+        settings: null,
+      },
+      packageRef: {
+        storageKey: `skill-binaries/${id}`,
+        checksum: `sha256:${id}`,
+        sizeBytes: 100,
+      },
+      sourcePayload: null,
+    },
+    status: { state: 'Available' },
+  }
+}
+
+function mockManagementFetch(installedPlugins: InstalledPlugin[] = []) {
   vi.stubGlobal(
     'fetch',
-    vi.fn((url: string) => {
+    vi.fn((url: string, init?: RequestInit) => {
       const requestUrl = new URL(url, 'http://localhost')
       if (requestUrl.pathname === '/api/plugins/installed') {
         return Promise.resolve({
           ok: true,
           status: 200,
-          json: () => Promise.resolve({ items: [] }),
+          json: () => Promise.resolve({ items: installedPlugins }),
+        })
+      }
+      if (requestUrl.pathname.startsWith('/api/plugins/installed/')) {
+        const id = Number(requestUrl.pathname.split('/').at(-1))
+        const plugin = installedPlugins.find(item => item.metadata.labels?.id === String(id))
+        return Promise.resolve({
+          ok: true,
+          status: init?.method === 'DELETE' ? 204 : 200,
+          json: () => Promise.resolve(plugin ?? {}),
         })
       }
       if (requestUrl.pathname === '/api/mcps/installed') {
@@ -61,4 +120,32 @@ describe('PluginManagementWorkspace', () => {
 
     expect(screen.queryByTestId('plugins-create-plugin-option')).not.toBeInTheDocument()
   })
+
+  test('groups installed runtime variants as one logical plugin', async () => {
+    mockManagementFetch([
+      makeInstalledPlugin(501, 'claudecode'),
+      makeInstalledPlugin(502, 'codex'),
+      makeInstalledPlugin(503, 'claudecode'),
+    ])
+
+    render(<PluginManagementWorkspace />)
+
+    expect(await screen.findByText('superpowers')).toBeInTheDocument()
+    expect(screen.getAllByTestId(/installed-plugin-row-/)).toHaveLength(1)
+
+    await userEvent.click(screen.getByTestId('installed-plugin-toggle-501'))
+
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/installed/501',
+      expect.objectContaining({ method: 'PUT' })
+    )
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/installed/502',
+      expect.objectContaining({ method: 'PUT' })
+    )
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/installed/503',
+      expect.objectContaining({ method: 'PUT' })
+    )
+  })
 })
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.tsx b/wework/src/components/plugins/PluginManagementWorkspace.tsx
index 41024e43b5..c59219b82e 100644
--- a/wework/src/components/plugins/PluginManagementWorkspace.tsx
+++ b/wework/src/components/plugins/PluginManagementWorkspace.tsx
@@ -121,29 +121,79 @@ function toInstalledMcpItem(item: InstalledMCP): InstalledMcpItem {
   }
 }
 
-function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
+function getInstalledPluginId(item: InstalledPlugin): number {
   const labels = item.metadata['labels']
   const id =
     labels && typeof labels === 'object' ? (labels as Record<string, unknown>).id : undefined
-  const components = item.spec.components
-  return {
-    id: Number(id ?? 0),
-    name: item.spec.displayName || item.spec.source.pluginKey,
-    description: item.spec.description,
-    enabled: item.spec.enabled,
-    version: item.spec.version,
-    componentCounts: {
-      skills: components.skills.length,
-      commands: components.commands.length,
-      agents: components.agents.length,
-      mcp: components.mcps.length,
-      hooks: components.hooks.length,
-      lsp: components.lsps.length,
-      monitors: components.monitors.length,
-      bin: components.bins.length,
-    },
-    raw: item,
+  return Number(id ?? 0)
+}
+
+function installedPluginGroupKey(item: InstalledPlugin): string {
+  return `${item.spec.source.type}:${item.spec.source.pluginKey}`
+}
+
+function countUniquePluginComponents(items: InstalledPlugin[]): Record<string, number> {
+  const counts = {
+    skills: new Set<string>(),
+    commands: new Set<string>(),
+    agents: new Set<string>(),
+    hooks: new Set<string>(),
+    mcp: new Set<string>(),
+    lsp: new Set<string>(),
+    monitors: new Set<string>(),
+    bin: new Set<string>(),
   }
+
+  items.forEach(item => {
+    const components = item.spec.components
+    components.skills.forEach(component => counts.skills.add(component.name))
+    components.commands.forEach(component => counts.commands.add(component.name))
+    components.agents.forEach(component => counts.agents.add(component.name))
+    components.hooks.forEach(component => counts.hooks.add(component.name))
+    components.mcps.forEach(component => counts.mcp.add(component.name))
+    components.lsps.forEach(component => counts.lsp.add(component.name))
+    components.monitors.forEach(component => counts.monitors.add(component.name))
+    components.bins.forEach(component => counts.bin.add(component.name))
+  })
+
+  return Object.fromEntries(
+    Object.entries(counts).map(([key, values]) => [key, values.size])
+  ) as Record<string, number>
+}
+
+function runtimeRank(item: InstalledPlugin): number {
+  if (item.spec.runtime === 'claudecode') return 0
+  if (item.spec.runtime === 'codex') return 1
+  return 2
+}
+
+function groupInstalledPlugins(items: InstalledPlugin[]): InstalledPluginItem[] {
+  const groups = new Map<string, InstalledPlugin[]>()
+  items.forEach(item => {
+    const key = installedPluginGroupKey(item)
+    groups.set(key, [...(groups.get(key) ?? []), item])
+  })
+
+  return Array.from(groups.values()).map(group => {
+    const variants = [...group].sort((left, right) => {
+      const runtimeDiff = runtimeRank(left) - runtimeRank(right)
+      if (runtimeDiff !== 0) return runtimeDiff
+      return getInstalledPluginId(left) - getInstalledPluginId(right)
+    })
+    const representative = variants[0]
+    const ids = variants.map(getInstalledPluginId).filter(id => id > 0)
+    return {
+      id: ids[0] ?? 0,
+      ids,
+      name: representative.spec.displayName || representative.spec.source.pluginKey,
+      description: representative.spec.description,
+      enabled: variants.every(item => item.spec.enabled),
+      version: representative.spec.version,
+      componentCounts: countUniquePluginComponents(variants),
+      raw: representative,
+      rawVariants: variants,
+    }
+  })
 }
 
 const emptyCustomMcpForm: CustomMcpFormState = {
@@ -255,7 +305,7 @@ export function PluginManagementWorkspace({
       .listInstalledPlugins()
       .then(response => {
         if (!isCurrent) return
-        setInstalledPlugins(response.items.map(toInstalledPluginItem))
+        setInstalledPlugins(groupInstalledPlugins(response.items))
         setIsLoadingPlugins(false)
       })
       .catch(() => {
@@ -396,15 +446,24 @@ export function PluginManagementWorkspace({
   const toggleInstalledPlugin = (id: number) => {
     const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
+    const nextEnabled = !plugin.enabled
 
     setInstalledPlugins(previous =>
-      previous.map(item => (item.id === id ? { ...item, enabled: !item.enabled } : item))
+      previous.map(item => (item.id === id ? { ...item, enabled: nextEnabled } : item))
     )
-    pluginApi.updateInstalledPlugin(id, { enabled: !plugin.enabled }).catch(() => {
-      setInstalledPlugins(previous =>
-        previous.map(item => (item.id === id ? { ...item, enabled: plugin.enabled } : item))
+    Promise.all(
+      plugin.ids.map(pluginId =>
+        pluginApi.updateInstalledPlugin(pluginId, { enabled: nextEnabled })
       )
-    })
+    )
+      .then(updatedItems => {
+        const [nextItem] = groupInstalledPlugins(updatedItems)
+        if (!nextItem) return
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? nextItem : item)))
+      })
+      .catch(() => {
+        setInstalledPlugins(previous => previous.map(item => (item.id === id ? plugin : item)))
+      })
   }
 
   const togglePluginComponent = (id: number, componentKey: string, enabled: boolean) => {
@@ -425,14 +484,30 @@ export function PluginManagementWorkspace({
                   componentStates: nextStates,
                 },
               },
+              rawVariants: item.rawVariants.map(variant => ({
+                ...variant,
+                spec: {
+                  ...variant.spec,
+                  componentStates: {
+                    ...(variant.spec.componentStates || {}),
+                    [componentKey]: enabled,
+                  },
+                },
+              })),
             }
           : item
       )
     )
-    pluginApi
-      .updateInstalledPlugin(id, { componentStates: { [componentKey]: enabled } })
-      .then(updated => {
-        const nextItem = toInstalledPluginItem(updated)
+    Promise.all(
+      plugin.ids.map(pluginId =>
+        pluginApi.updateInstalledPlugin(pluginId, {
+          componentStates: { [componentKey]: enabled },
+        })
+      )
+    )
+      .then(updatedItems => {
+        const [nextItem] = groupInstalledPlugins(updatedItems)
+        if (!nextItem) return
         setInstalledPlugins(previous => previous.map(item => (item.id === id ? nextItem : item)))
       })
       .catch(() => {
@@ -446,9 +521,11 @@ export function PluginManagementWorkspace({
 
     setInstalledPlugins(previous => previous.filter(item => item.id !== id))
     setSelectedPluginId(current => (current === id ? null : current))
-    pluginApi.uninstallInstalledPlugin(id).catch(() => {
-      setInstalledPlugins(previous => [...previous, plugin])
-    })
+    Promise.all(plugin.ids.map(pluginId => pluginApi.uninstallInstalledPlugin(pluginId))).catch(
+      () => {
+        setInstalledPlugins(previous => [...previous, plugin])
+      }
+    )
   }
 
   const createCustomMcp = (event: FormEvent<HTMLFormElement>) => {
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index 76cd8e4015..e2234f9b4d 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -207,6 +207,7 @@ function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
   const components = item.spec.components
   return {
     id: Number(id ?? 0),
+    ids: Number(id ?? 0) > 0 ? [Number(id ?? 0)] : [],
     name: item.spec.displayName || item.spec.source.pluginKey,
     description: item.spec.description,
     enabled: item.spec.enabled,
@@ -222,6 +223,7 @@ function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
       bin: components.bins.length,
     },
     raw: item,
+    rawVariants: [item],
   }
 }
 

From 3725c1e2b07759bcf02b71b7a0cd6a1adacf8668 Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:51:13 +0800
Subject: [PATCH 5/8] fix: use primary text color for plugin catalog title

---
 wework/src/components/plugins/PluginsWorkspace.test.tsx | 5 +++++
 wework/src/components/plugins/PluginsWorkspace.tsx      | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index 078b2bdedb..6198c3050b 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -529,6 +529,11 @@ describe('PluginsWorkspace', () => {
       'bg-primary/10',
       'text-primary'
     )
+    expect(screen.getByTestId('system-plugin-title-100')).toHaveClass(
+      'min-w-0',
+      'flex-1',
+      'text-text-primary'
+    )
     expect(screen.queryByText('上传 Claude Code 插件')).not.toBeInTheDocument()
 
     await userEvent.click(screen.getByTestId('plugins-create-button'))
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index e2234f9b4d..d4c5dd7196 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -326,11 +326,14 @@ function SystemPluginCatalogRow({
       </div>
       <div className="min-w-0 flex-1">
         <div className="flex min-w-0 items-center gap-2">
-          <h3 className="truncate text-base font-semibold leading-5 sm:text-[15px]">
+          <h3
+            className="min-w-0 flex-1 truncate text-base font-semibold leading-5 text-text-primary sm:text-[15px]"
+            data-testid={`system-plugin-title-${safeId}`}
+          >
             {plugin.displayName || plugin.name}
           </h3>
           {plugin.version && (
-            <span className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted">
+            <span className="shrink-0 rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted">
               {plugin.version}
             </span>
           )}

From d70317fc3deaf263160e10bf4c5c227c2de6c861 Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 16:57:38 +0800
Subject: [PATCH 6/8] fix: label installed plugin source and runtime

---
 .../plugins/PluginManagementRows.tsx          | 37 ++++++++++++++++++-
 .../PluginManagementWorkspace.test.tsx        | 31 +++++++++++++++-
 .../plugins/PluginManagementWorkspace.tsx     | 18 +++++++++
 .../components/plugins/PluginsWorkspace.tsx   |  2 +
 wework/src/i18n/locales/en/common.json        |  6 +++
 wework/src/i18n/locales/zh-CN/common.json     |  6 +++
 6 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/wework/src/components/plugins/PluginManagementRows.tsx b/wework/src/components/plugins/PluginManagementRows.tsx
index 37a5173a0a..571aa14a19 100644
--- a/wework/src/components/plugins/PluginManagementRows.tsx
+++ b/wework/src/components/plugins/PluginManagementRows.tsx
@@ -1,6 +1,6 @@
 import { Boxes, Globe, Sparkles, Trash2 } from 'lucide-react'
 import { useTranslation } from '@/hooks/useTranslation'
-import type { InstalledPlugin } from '@/types/api'
+import type { InstalledPlugin, PluginRuntime } from '@/types/api'
 
 export interface InstalledSkillItem {
   id: number
@@ -25,11 +25,25 @@ export interface InstalledPluginItem {
   description: string
   enabled: boolean
   version?: string | null
+  sourceType: InstalledPlugin['spec']['source']['type']
+  runtimes: PluginRuntime[]
   componentCounts: Record<string, number>
   raw: InstalledPlugin
   rawVariants: InstalledPlugin[]
 }
 
+const pluginSourceFallback: Record<InstalledPluginItem['sourceType'], string> = {
+  system: '系统插件',
+  upload: '上传插件',
+  marketplace: '市场插件',
+  local: '本地插件',
+}
+
+const pluginRuntimeFallback: Record<PluginRuntime, string> = {
+  claudecode: 'ClaudeCode',
+  codex: 'Codex',
+}
+
 export function InstalledSkillRow({
   skill,
   onToggle,
@@ -160,6 +174,13 @@ export function InstalledPluginRow({
   const componentLabels = Object.entries(plugin.componentCounts)
     .filter(([, count]) => count > 0)
     .map(([key, count]) => `${key} ${count}`)
+  const sourceLabel = t(
+    `workbench.plugin_source_${plugin.sourceType}`,
+    pluginSourceFallback[plugin.sourceType]
+  )
+  const runtimeLabel = plugin.runtimes
+    .map(runtime => t(`workbench.plugin_runtime_${runtime}`, pluginRuntimeFallback[runtime]))
+    .join(' + ')
 
   return (
     <article
@@ -187,6 +208,20 @@ export function InstalledPluginRow({
               {plugin.version}
             </span>
           )}
+          <span
+            className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted"
+            data-testid={`installed-plugin-source-${plugin.id}`}
+          >
+            {sourceLabel}
+          </span>
+          {runtimeLabel && (
+            <span
+              className="rounded-md bg-surface px-2 py-0.5 text-xs font-semibold text-text-muted"
+              data-testid={`installed-plugin-runtime-${plugin.id}`}
+            >
+              {runtimeLabel}
+            </span>
+          )}
         </div>
         <p className="mt-1 truncate text-[15px] leading-6 text-text-secondary">
           {plugin.description || componentLabels.join(' · ')}
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.test.tsx b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
index ad92f2ff5a..cc32f887ea 100644
--- a/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginManagementWorkspace.test.tsx
@@ -5,7 +5,11 @@ import '@/i18n'
 import { PluginManagementWorkspace } from './PluginManagementWorkspace'
 import type { InstalledPlugin } from '@/types/api'
 
-function makeInstalledPlugin(id: number, runtime: 'claudecode' | 'codex'): InstalledPlugin {
+function makeInstalledPlugin(
+  id: number,
+  runtime: 'claudecode' | 'codex',
+  sourceType: InstalledPlugin['spec']['source']['type'] = 'system'
+): InstalledPlugin {
   return {
     apiVersion: 'agent.wecode.io/v1',
     kind: 'InstalledPlugin',
@@ -16,7 +20,7 @@ function makeInstalledPlugin(id: number, runtime: 'claudecode' | 'codex'): Insta
     },
     spec: {
       source: {
-        type: 'system',
+        type: sourceType,
         providerKey: runtime === 'codex' ? 'codex' : 'claude-code',
         pluginKey: 'superpowers',
         catalogItemId: '100',
@@ -132,6 +136,10 @@ describe('PluginManagementWorkspace', () => {
 
     expect(await screen.findByText('superpowers')).toBeInTheDocument()
     expect(screen.getAllByTestId(/installed-plugin-row-/)).toHaveLength(1)
+    expect(screen.getByTestId('installed-plugin-source-501')).toHaveTextContent('系统插件')
+    expect(screen.getByTestId('installed-plugin-runtime-501')).toHaveTextContent(
+      'ClaudeCode + Codex'
+    )
 
     await userEvent.click(screen.getByTestId('installed-plugin-toggle-501'))
 
@@ -148,4 +156,23 @@ describe('PluginManagementWorkspace', () => {
       expect.objectContaining({ method: 'PUT' })
     )
   })
+
+  test('distinguishes same-name plugins by source', async () => {
+    mockManagementFetch([
+      makeInstalledPlugin(501, 'claudecode', 'system'),
+      makeInstalledPlugin(502, 'codex', 'system'),
+      makeInstalledPlugin(601, 'claudecode', 'upload'),
+    ])
+
+    render(<PluginManagementWorkspace />)
+
+    expect(await screen.findAllByText('superpowers')).toHaveLength(2)
+    expect(screen.getAllByTestId(/installed-plugin-row-/)).toHaveLength(2)
+    expect(screen.getByTestId('installed-plugin-source-501')).toHaveTextContent('系统插件')
+    expect(screen.getByTestId('installed-plugin-runtime-501')).toHaveTextContent(
+      'ClaudeCode + Codex'
+    )
+    expect(screen.getByTestId('installed-plugin-source-601')).toHaveTextContent('上传插件')
+    expect(screen.getByTestId('installed-plugin-runtime-601')).toHaveTextContent('ClaudeCode')
+  })
 })
diff --git a/wework/src/components/plugins/PluginManagementWorkspace.tsx b/wework/src/components/plugins/PluginManagementWorkspace.tsx
index c59219b82e..95f1fcb460 100644
--- a/wework/src/components/plugins/PluginManagementWorkspace.tsx
+++ b/wework/src/components/plugins/PluginManagementWorkspace.tsx
@@ -35,6 +35,7 @@ import type {
   InstalledSkill,
   MCPProviderInfo,
   MCPServer,
+  PluginRuntime,
 } from '@/types/api'
 
 type ManagementTab = 'plugins' | 'apps' | 'mcp' | 'skills' | 'marketplace'
@@ -167,6 +168,21 @@ function runtimeRank(item: InstalledPlugin): number {
   return 2
 }
 
+function pluginRuntimes(items: InstalledPlugin[]): PluginRuntime[] {
+  return Array.from(
+    new Set(
+      items
+        .map(item => item.spec.runtime)
+        .filter(
+          (runtime): runtime is PluginRuntime => runtime === 'claudecode' || runtime === 'codex'
+        )
+    )
+  ).sort((left, right) => {
+    const rank = { claudecode: 0, codex: 1 }
+    return rank[left] - rank[right]
+  })
+}
+
 function groupInstalledPlugins(items: InstalledPlugin[]): InstalledPluginItem[] {
   const groups = new Map<string, InstalledPlugin[]>()
   items.forEach(item => {
@@ -189,6 +205,8 @@ function groupInstalledPlugins(items: InstalledPlugin[]): InstalledPluginItem[]
       description: representative.spec.description,
       enabled: variants.every(item => item.spec.enabled),
       version: representative.spec.version,
+      sourceType: representative.spec.source.type,
+      runtimes: pluginRuntimes(variants),
       componentCounts: countUniquePluginComponents(variants),
       raw: representative,
       rawVariants: variants,
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index d4c5dd7196..c4fcae3960 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -212,6 +212,8 @@ function toInstalledPluginItem(item: InstalledPlugin): InstalledPluginItem {
     description: item.spec.description,
     enabled: item.spec.enabled,
     version: item.spec.version,
+    sourceType: item.spec.source.type,
+    runtimes: [item.spec.runtime],
     componentCounts: {
       skills: components.skills.length,
       commands: components.commands.length,
diff --git a/wework/src/i18n/locales/en/common.json b/wework/src/i18n/locales/en/common.json
index bbec3a6fda..50a027890b 100644
--- a/wework/src/i18n/locales/en/common.json
+++ b/wework/src/i18n/locales/en/common.json
@@ -416,6 +416,12 @@
     "plugins_no_available_plugins": "No available plugins",
     "plugins_installed_mcps": "Installed MCP",
     "plugins_installed_mcps_description": "Global installs enter the device install inventory and can be enabled or uninstalled.",
+    "plugin_source_system": "System plugin",
+    "plugin_source_upload": "Uploaded plugin",
+    "plugin_source_marketplace": "Marketplace plugin",
+    "plugin_source_local": "Local plugin",
+    "plugin_runtime_claudecode": "ClaudeCode",
+    "plugin_runtime_codex": "Codex",
     "plugins_mcp_providers": "MCP Providers",
     "plugins_mcp_providers_description": "Configure a token, sync provider services, and install MCP servers by provider.",
     "plugins_custom_mcp_title": "Create custom MCP",
diff --git a/wework/src/i18n/locales/zh-CN/common.json b/wework/src/i18n/locales/zh-CN/common.json
index 0f840faaaa..d54f66e421 100644
--- a/wework/src/i18n/locales/zh-CN/common.json
+++ b/wework/src/i18n/locales/zh-CN/common.json
@@ -416,6 +416,12 @@
     "plugins_no_available_plugins": "暂无可用插件",
     "plugins_installed_mcps": "已安装 MCP",
     "plugins_installed_mcps_description": "全局安装后会进入设备安装清单，可单独启用或卸载。",
+    "plugin_source_system": "系统插件",
+    "plugin_source_upload": "上传插件",
+    "plugin_source_marketplace": "市场插件",
+    "plugin_source_local": "本地插件",
+    "plugin_runtime_claudecode": "ClaudeCode",
+    "plugin_runtime_codex": "Codex",
     "plugins_mcp_providers": "MCP 供应商",
     "plugins_mcp_providers_description": "配置 token 后同步供应商服务，并按供应商分区安装需要的 MCP。",
     "plugins_custom_mcp_title": "创建自定义 MCP",

From 3ac119523eca322106482876529e108cada5c57d Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 17:06:29 +0800
Subject: [PATCH 7/8] fix: allow uninstall from plugin catalog

---
 .../plugins/PluginsWorkspace.test.tsx         | 28 ++++++++
 .../components/plugins/PluginsWorkspace.tsx   | 71 ++++++++++++++++---
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index 6198c3050b..94df1e8c86 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -448,6 +448,13 @@ function mockSystemSkillsFetch(
             Promise.resolve({ items: [installedPluginResponse, installedCodexPluginResponse] }),
         })
       }
+      if (requestUrl.pathname.startsWith('/api/plugins/installed/')) {
+        return Promise.resolve({
+          ok: true,
+          status: 204,
+          json: () => Promise.resolve(null),
+        })
+      }
       if (requestUrl.pathname === '/api/plugins/installed') {
         return Promise.resolve({
           ok: true,
@@ -563,6 +570,27 @@ describe('PluginsWorkspace', () => {
     )
   })
 
+  test('uninstalls an installed system plugin from the catalog', async () => {
+    mockSystemSkillsFetch({
+      pluginInstallState: 'installed',
+      installedPluginId: 55,
+    })
+    render(<PluginsWorkspace />)
+
+    expect(await screen.findByText('Superpowers')).toBeInTheDocument()
+    await userEvent.click(screen.getByTestId('system-plugin-uninstall-100'))
+
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/installed/55',
+      expect.objectContaining({ method: 'DELETE' })
+    )
+    expect(fetch).toHaveBeenCalledWith(
+      '/api/plugins/installed/56',
+      expect.objectContaining({ method: 'DELETE' })
+    )
+    expect(screen.getByTestId('system-plugin-install-100')).toBeInTheDocument()
+  })
+
   test('filters skills and shows the empty state for unmatched search', async () => {
     render(<PluginsWorkspace />)
 
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index c4fcae3960..1590e40bd8 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -1,7 +1,6 @@
 import {
   Boxes,
   BookOpen,
-  Check,
   ImageIcon,
   MoreHorizontal,
   Plus,
@@ -9,6 +8,7 @@ import {
   Search,
   Settings,
   Sparkles,
+  Trash2,
 } from 'lucide-react'
 import type { FormEvent, ReactNode } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -244,6 +244,21 @@ function componentCountsFromPlugin(
   }
 }
 
+function getCatalogInstalledPluginIds(plugin: PluginCatalogItem): number[] {
+  const ids = new Set<number>()
+  Object.values(plugin.installedPluginIds ?? {}).forEach(id => {
+    if (typeof id === 'number' && id > 0) {
+      ids.add(id)
+    }
+  })
+
+  if (typeof plugin.installedPluginId === 'number' && plugin.installedPluginId > 0) {
+    ids.add(plugin.installedPluginId)
+  }
+
+  return Array.from(ids)
+}
+
 function getKindIdFromMetadata(metadata: Record<string, unknown>): number | null {
   const labels = metadata['labels']
   const id =
@@ -301,16 +316,18 @@ function SystemPluginCatalogRow({
   plugin,
   installLabel,
   updateLabel,
-  enabledLabel,
+  uninstallLabel,
   onInstall,
   onUpdate,
+  onUninstall,
 }: {
   plugin: PluginCatalogItem
   installLabel: string
   updateLabel: string
-  enabledLabel: string
+  uninstallLabel: string
   onInstall: () => void
   onUpdate: () => void
+  onUninstall: () => void
 }) {
   const counts = componentCountsFromPlugin(plugin.components)
   const componentLabels = Object.entries(counts)
@@ -355,12 +372,15 @@ function SystemPluginCatalogRow({
           <RefreshCw className="h-4 w-4" />
         </button>
       ) : plugin.installState === 'installed' ? (
-        <span
-          aria-label={enabledLabel}
-          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-text-muted sm:h-8 sm:w-8 sm:rounded-lg"
+        <button
+          type="button"
+          aria-label={uninstallLabel}
+          data-testid={`system-plugin-uninstall-${safeId}`}
+          onClick={onUninstall}
+          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-text-muted hover:bg-surface hover:text-red-500 sm:h-8 sm:w-8 sm:rounded-lg"
         >
-          <Check className="h-4 w-4" />
-        </span>
+          <Trash2 className="h-4 w-4" />
+        </button>
       ) : (
         <button
           type="button"
@@ -776,6 +796,38 @@ export function PluginsWorkspace({
     updateCatalogAfterInstall(plugin.id, installed)
   }
 
+  const uninstallCatalogPlugin = async (plugin: PluginCatalogItem) => {
+    const installedPluginIds = getCatalogInstalledPluginIds(plugin)
+    if (installedPluginIds.length === 0) return
+
+    const previousInstalledPlugins = installedPlugins
+    const previousCatalogItems = pluginCatalogState.items
+    const idSet = new Set(installedPluginIds)
+
+    setInstalledPlugins(previous => previous.filter(item => !idSet.has(item.id)))
+    setPluginCatalogState(previous => ({
+      ...previous,
+      items: previous.items.map(item =>
+        item.id === plugin.id
+          ? {
+              ...item,
+              installState: 'not_installed',
+              installedPluginId: null,
+              installedPluginIds: {},
+              installedChecksum: null,
+            }
+          : item
+      ),
+    }))
+
+    try {
+      await Promise.all(installedPluginIds.map(id => pluginApi.uninstallInstalledPlugin(id)))
+    } catch {
+      setInstalledPlugins(previousInstalledPlugins)
+      setPluginCatalogState(previous => ({ ...previous, items: previousCatalogItems }))
+    }
+  }
+
   const toggleInstalledPlugin = (id: number) => {
     const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
@@ -1349,11 +1401,12 @@ export function PluginsWorkspace({
                   <SystemPluginCatalogRow
                     key={plugin.id}
                     plugin={plugin}
-                    enabledLabel={t('workbench.plugins_enabled', '已启用')}
                     installLabel={t('workbench.plugins_install', '安装')}
+                    uninstallLabel={t('workbench.plugins_uninstall', '卸载')}
                     updateLabel={t('workbench.plugins_update', '更新')}
                     onInstall={() => void installCatalogPlugin(plugin)}
                     onUpdate={() => void updateCatalogPlugin(plugin)}
+                    onUninstall={() => void uninstallCatalogPlugin(plugin)}
                   />
                 ))}
               </div>

From a0d646cf211f19ca48672b40d57364461a12efb7 Mon Sep 17 00:00:00 2001
From: yunpeng7 <yunpeng7@staff.weibo.com>
Date: Tue, 23 Jun 2026 17:38:32 +0800
Subject: [PATCH 8/8] fix: separate plugin catalog management actions

---
 .../plugins/PluginsWorkspace.test.tsx         | 22 ++----
 .../components/plugins/PluginsWorkspace.tsx   | 70 +++----------------
 2 files changed, 13 insertions(+), 79 deletions(-)

diff --git a/wework/src/components/plugins/PluginsWorkspace.test.tsx b/wework/src/components/plugins/PluginsWorkspace.test.tsx
index 94df1e8c86..163cfc7b44 100644
--- a/wework/src/components/plugins/PluginsWorkspace.test.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.test.tsx
@@ -448,13 +448,6 @@ function mockSystemSkillsFetch(
             Promise.resolve({ items: [installedPluginResponse, installedCodexPluginResponse] }),
         })
       }
-      if (requestUrl.pathname.startsWith('/api/plugins/installed/')) {
-        return Promise.resolve({
-          ok: true,
-          status: 204,
-          json: () => Promise.resolve(null),
-        })
-      }
       if (requestUrl.pathname === '/api/plugins/installed') {
         return Promise.resolve({
           ok: true,
@@ -570,7 +563,7 @@ describe('PluginsWorkspace', () => {
     )
   })
 
-  test('uninstalls an installed system plugin from the catalog', async () => {
+  test('shows installed system plugins in the catalog without uninstall actions', async () => {
     mockSystemSkillsFetch({
       pluginInstallState: 'installed',
       installedPluginId: 55,
@@ -578,17 +571,12 @@ describe('PluginsWorkspace', () => {
     render(<PluginsWorkspace />)
 
     expect(await screen.findByText('Superpowers')).toBeInTheDocument()
-    await userEvent.click(screen.getByTestId('system-plugin-uninstall-100'))
-
-    expect(fetch).toHaveBeenCalledWith(
-      '/api/plugins/installed/55',
-      expect.objectContaining({ method: 'DELETE' })
-    )
-    expect(fetch).toHaveBeenCalledWith(
-      '/api/plugins/installed/56',
+    expect(screen.getByTestId('system-plugin-installed-100')).toHaveTextContent('已安装')
+    expect(screen.queryByTestId('system-plugin-uninstall-100')).not.toBeInTheDocument()
+    expect(fetch).not.toHaveBeenCalledWith(
+      expect.stringMatching(/\/api\/plugins\/installed\/\d+/),
       expect.objectContaining({ method: 'DELETE' })
     )
-    expect(screen.getByTestId('system-plugin-install-100')).toBeInTheDocument()
   })
 
   test('filters skills and shows the empty state for unmatched search', async () => {
diff --git a/wework/src/components/plugins/PluginsWorkspace.tsx b/wework/src/components/plugins/PluginsWorkspace.tsx
index 1590e40bd8..cdd12c4eeb 100644
--- a/wework/src/components/plugins/PluginsWorkspace.tsx
+++ b/wework/src/components/plugins/PluginsWorkspace.tsx
@@ -8,7 +8,6 @@ import {
   Search,
   Settings,
   Sparkles,
-  Trash2,
 } from 'lucide-react'
 import type { FormEvent, ReactNode } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -244,21 +243,6 @@ function componentCountsFromPlugin(
   }
 }
 
-function getCatalogInstalledPluginIds(plugin: PluginCatalogItem): number[] {
-  const ids = new Set<number>()
-  Object.values(plugin.installedPluginIds ?? {}).forEach(id => {
-    if (typeof id === 'number' && id > 0) {
-      ids.add(id)
-    }
-  })
-
-  if (typeof plugin.installedPluginId === 'number' && plugin.installedPluginId > 0) {
-    ids.add(plugin.installedPluginId)
-  }
-
-  return Array.from(ids)
-}
-
 function getKindIdFromMetadata(metadata: Record<string, unknown>): number | null {
   const labels = metadata['labels']
   const id =
@@ -315,19 +299,17 @@ function tabClassName(selected: boolean) {
 function SystemPluginCatalogRow({
   plugin,
   installLabel,
+  installedLabel,
   updateLabel,
-  uninstallLabel,
   onInstall,
   onUpdate,
-  onUninstall,
 }: {
   plugin: PluginCatalogItem
   installLabel: string
+  installedLabel: string
   updateLabel: string
-  uninstallLabel: string
   onInstall: () => void
   onUpdate: () => void
-  onUninstall: () => void
 }) {
   const counts = componentCountsFromPlugin(plugin.components)
   const componentLabels = Object.entries(counts)
@@ -372,15 +354,12 @@ function SystemPluginCatalogRow({
           <RefreshCw className="h-4 w-4" />
         </button>
       ) : plugin.installState === 'installed' ? (
-        <button
-          type="button"
-          aria-label={uninstallLabel}
-          data-testid={`system-plugin-uninstall-${safeId}`}
-          onClick={onUninstall}
-          className="flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-text-muted hover:bg-surface hover:text-red-500 sm:h-8 sm:w-8 sm:rounded-lg"
+        <span
+          data-testid={`system-plugin-installed-${safeId}`}
+          className="shrink-0 rounded-lg bg-surface px-3 py-1.5 text-xs font-semibold text-text-muted"
         >
-          <Trash2 className="h-4 w-4" />
-        </button>
+          {installedLabel}
+        </span>
       ) : (
         <button
           type="button"
@@ -796,38 +775,6 @@ export function PluginsWorkspace({
     updateCatalogAfterInstall(plugin.id, installed)
   }
 
-  const uninstallCatalogPlugin = async (plugin: PluginCatalogItem) => {
-    const installedPluginIds = getCatalogInstalledPluginIds(plugin)
-    if (installedPluginIds.length === 0) return
-
-    const previousInstalledPlugins = installedPlugins
-    const previousCatalogItems = pluginCatalogState.items
-    const idSet = new Set(installedPluginIds)
-
-    setInstalledPlugins(previous => previous.filter(item => !idSet.has(item.id)))
-    setPluginCatalogState(previous => ({
-      ...previous,
-      items: previous.items.map(item =>
-        item.id === plugin.id
-          ? {
-              ...item,
-              installState: 'not_installed',
-              installedPluginId: null,
-              installedPluginIds: {},
-              installedChecksum: null,
-            }
-          : item
-      ),
-    }))
-
-    try {
-      await Promise.all(installedPluginIds.map(id => pluginApi.uninstallInstalledPlugin(id)))
-    } catch {
-      setInstalledPlugins(previousInstalledPlugins)
-      setPluginCatalogState(previous => ({ ...previous, items: previousCatalogItems }))
-    }
-  }
-
   const toggleInstalledPlugin = (id: number) => {
     const plugin = installedPlugins.find(item => item.id === id)
     if (!plugin) return
@@ -1402,11 +1349,10 @@ export function PluginsWorkspace({
                     key={plugin.id}
                     plugin={plugin}
                     installLabel={t('workbench.plugins_install', '安装')}
-                    uninstallLabel={t('workbench.plugins_uninstall', '卸载')}
+                    installedLabel={t('workbench.plugins_installed', '已安装')}
                     updateLabel={t('workbench.plugins_update', '更新')}
                     onInstall={() => void installCatalogPlugin(plugin)}
                     onUpdate={() => void updateCatalogPlugin(plugin)}
-                    onUninstall={() => void uninstallCatalogPlugin(plugin)}
                   />
                 ))}
               </div>