@@ -25,3 +25,13 @@ scripts/publish_incremental.py   export-ignore
 tests/test_sync_external_prs.py  export-ignore
 tests/test_distribution.py       export-ignore
 tests/test_public_docs.py        export-ignore
+.agents/skills/zcode-plugin-sync/ export-ignore
+.claude/skills/zcode-plugin-sync  export-ignore
+.agents/skills/zcode-plugin-license-review/  export-ignore
+.claude/skills/zcode-plugin-license-review   export-ignore
+
+plugins/openpencil/licenses/font-NotoNaskhArabic-OFL.txt -whitespace
+
+# Blank context lines in unified patches intentionally contain one space.
+ui-plugins/*craft/patches/*.patch -whitespace
+ui-plugins/craft-runtime/fonts/OFL-LXGWWenKai.txt -whitespace
@@ -6,6 +6,27 @@ PR title must follow Conventional Commits / PR 标题必须符合 Conventional C
 The PR title becomes the squash commit on main. / PR 标题会成为 main 上的最终提交信息。
 -->
 
+## Plugin type (required) / 插件类型（必填）
+
+Select exactly one before requesting review. / 发起评审前必须且只能勾选一项。
+
+- [ ] **UI Plugin / 是 UI 插件** — provides MCP Apps interactive pages / 提供 MCP Apps 交互页面
+- [ ] **Standard plugin / 普通插件（非 UI）** — does not provide MCP Apps interactive pages / 不提供 MCP Apps 交互页面
+- [ ] **Not applicable / 不适用** — repository-only changes; no plugin content changed / 仅仓库级改动，不涉及插件内容
+
+Affected plugin name(s) / 涉及的插件名称：
+
+<!-- Use the manifest name; write N/A only for repository-only changes.
+     填写清单中的 name；仅仓库级改动时填写 N/A。 -->
+
+Classify the affected plugin, even when only changing its docs or skills. Adding or removing an interactive page also counts as a UI Plugin change. For multiple plugins, list each name and type; select UI Plugin if any is affected.
+
+按涉及的插件判断，即使本次只改它的文档或 skill 也须声明类型。新增或移除交互页面也属于 UI Plugin 改动。涉及多个插件时分别列出名称和类型，只要包含 UI Plugin 就选择 UI Plugin。
+
+`ui.surfaces` panels and tool-result pages using `_meta.ui.resourceUri` both count. An MCP server or a skill that generates Gen UI alone does not. This declaration is separate from marketplace `category`.
+
+`ui.surfaces` 面板和通过 `_meta.ui.resourceUri` 展示的工具结果页面都算 UI Plugin。仅有 MCP server 或生成 Gen UI 的 skill 不算。这项声明与市场 `category` 分类独立。
+
 ## What / 改动内容
 
 <!-- What does this PR change, and why? / 这个 PR 改了什么，为什么？ -->
@@ -15,7 +36,9 @@ The PR title becomes the squash commit on main. / PR 标题会成为 main 上的
 <!-- For plugin changes. Delete this section for repo-level changes (docs/ci).
      插件改动必填；纯仓库级改动（docs/ci）可删除本节。 -->
 
-- [ ] Plugin name is unique kebab-case; directory is `plugins/<name>/` / 插件名唯一且 kebab-case，目录为 `plugins/<name>/`
+- [ ] Plugin name is unique kebab-case; new external plugin directory is `external_plugins/<name>/`; existing fixes retain ownership / 插件名唯一且 kebab-case，外部新增插件位于 `external_plugins/<name>/`，已有插件修复保留原归属
+- [ ] Usage `category` is set independently of publisher ownership / 用途分类 `category` 已填写，与维护归属分开
+- [ ] Plugin type and affected names are declared above / 已在上方声明插件类型与涉及的插件名称
 - [ ] `version` bumped in BOTH `plugin.json` and `marketplace.json` (artifacts are immutable) / `plugin.json` 与 `marketplace.json` 两处版本号已同步升级（制品不可变）
 - [ ] `README.md` (EN) and `README_CN.md` (中文) both updated and equivalent / 中英文 README 均已更新且语义一致
 - [ ] `description_i18n` has both `en` and `zh-CN` / `description_i18n` 包含 `en` 与 `zh-CN`
 
@@ -4,6 +4,7 @@ name: Publish
 on:
   push:
     branches: [main]
+  pull_request:
   workflow_dispatch:
 
 permissions:
@@ -23,6 +24,31 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "24.14.0"
+      - uses: pnpm/action-setup@v4
+        with:
+          version: "10.33.2"
+      # Craft Web snapshots are compiled from pinned upstream sources, not committed.
+      # Keep compiled snapshots and the installed Trunk between runs.
+      - uses: actions/cache@v4
+        with:
+          path: |
+            .craft-cache/snapshots
+            .craft-cache/tools
+          key: craft-${{ runner.os }}-${{ hashFiles('ui-plugins/*/upstream.json', 'ui-plugins/*/patches/**', 'ui-plugins/craft-runtime/**') }}
+          restore-keys: craft-${{ runner.os }}-
+      - name: Build and test MCP Apps
+        env:
+          CRAFT_TOOLCHAIN_INSTALL: "1"
+        run: |
+          pnpm install --frozen-lockfile
+          pnpm build
+          pnpm typecheck
+          pnpm lint
+          pnpm test
+          pnpm test:artifacts
       - name: Validate
         run: python scripts/validate.py
       - name: Build distribution
@@ -33,15 +59,15 @@ jobs:
           name: dist
           path: dist/
       - name: Upload Pages artifact
-        if: ${{ !github.event.repository.private }}
+        if: ${{ github.event_name != 'pull_request' && !github.event.repository.private }}
         uses: actions/upload-pages-artifact@v3
         with:
           path: dist/
 
   # Skipped when GitHub Pages is unavailable for the repository visibility tier.
   deploy-pages:
     needs: build
-    if: ${{ !github.event.repository.private }}
+    if: ${{ github.event_name != 'pull_request' && !github.event.repository.private }}
     runs-on: ubuntu-latest
     environment:
       name: github-pages
 
@@ -1,10 +1,25 @@
-dist/
-!plugins/mimosa/payload/dist/
-!plugins/mimosa/payload/dist/**
+# Release output, UI source build intermediates and compiled install payloads
+# are generated by `pnpm build`, in CI and locally. None of them is committed.
+/dist/
+/ui-plugins/**/dist/
+/plugins/*/dist/
+/external_plugins/*/dist/
 __pycache__/
 .DS_Store
 
 # Written by scripts/sync_external_prs.py for the CI after_script; never committed.
 mirror-failure.txt
 mirror-result.txt
 publish-failure.txt
+
+# MCP App development dependencies and generated license intermediates.
+node_modules/
+ui-plugins/*/licenses/
+*.tsbuildinfo
+
+# Craft Web snapshots are compiled from the pinned upstream; caches are local.
+/.craft-cache/
+/ui-plugins/*/web/
+
+# JetBrain IDE
+.idea/*
@@ -11,6 +11,9 @@ Derive the current contract from repository files, not memory or examples from o
 - Its actual component directories: `commands/`, `skills/`, `agents/`, and `hooks/`, plus `.mcp.json` when present
 - The matching entry in the root `marketplace.json`
 - Repository validators and tests for machine-enforced behavior
+- MCP App build sources under `ui-plugins/<name>/` and [the build contract](docs/MCP_APP_BUILD.md) when changing interactive plugins
+
+For local testing, ordinary plugins and UI plugins share [the existing development workflow](docs/PLUGIN_DEVELOPMENT.md#18-test-a-plugin-locally). The root marketplace is the only catalogue: never hardcode plugin names in generic build or registration scripts, and never force-install a development skill. Compiled plugins own their build and optional stage scripts. `pnpm build` generates `dist/local-marketplace`; developers register this source and choose what to install. Rebuild, refresh the source, and reinstall selected plugins after changes. The host's `pnpm dev:desktop` only starts the application. Verify the marketplace record, installation, enabled state, and actual UI in the same application profile before reporting availability. Preserve existing source identities and plugin data.
 
 ## Workflow
 
@@ -45,6 +48,8 @@ For a new plugin, start from `plugins/example-plugin/`, remove unused sample com
 Run the baseline checks from the repository root:
 
 ```shell
+pnpm install --frozen-lockfile
+pnpm build
 python3 scripts/validate.py
 python3 scripts/build_dist.py
 git diff --check
@@ -76,6 +81,7 @@ When adding a plugin, keep the merge request focused on the plugin package and i
 
 ## Git and Merge Request Workflow
 
+- Before requesting review, complete the required plugin-type section in the PR template: UI Plugin, Standard plugin, or Not applicable for repository-only changes. List affected manifest names; classify plugins with MCP Apps interactive pages as UI Plugin even for docs-only edits to that plugin. See the [classification rules](CONTRIBUTING.md#declare-the-plugin-type-required).
 - Use Conventional Commits for commit messages and merge request titles, for example `fix(assets): refresh business plugin icons`.
 - Before pushing a working branch or updating its merge request, fetch the latest `origin/main` and rebase the working branch onto it.
 - Resolve and verify any rebase conflicts locally before publishing the rewritten history.
 
@@ -14,7 +14,7 @@ Thank you for improving the ZCode Plugins Marketplace. Use GitHub Issues for pro
 
 Every plugin must:
 
-- live in a unique kebab-case directory under `plugins/`;
+- live in a unique kebab-case directory under `external_plugins/` for partner/community submissions; `plugins/` is reserved for officially maintained plugins;
 - include `.zcode-plugin/plugin.json` with `name`, `description`, `version`, and `author`;
 - have a matching `name`, `version`, and description in the root [`marketplace.json`](./marketplace.json);
 - provide at least one useful component: command, skill, hook, agent, or MCP server;
@@ -31,7 +31,8 @@ Do not commit credentials, private endpoints, customer data, machine-specific pa
 2. Copy the example plugin, or edit the existing plugin in scope:
 
    ```shell
-   cp -R plugins/example-plugin plugins/<your-plugin-name>
+   mkdir -p external_plugins
+   cp -R plugins/example-plugin external_plugins/<your-plugin-name>
    ```
 
 3. Update the manifest, component files, both language READMEs, and the root marketplace entry. Keep the manifest and marketplace versions identical.
@@ -47,6 +48,16 @@ Do not commit credentials, private endpoints, customer data, machine-specific pa
 
 ## Pull request checklist
 
+### Declare the plugin type (required)
+
+Every PR must complete **Plugin type** in the [PR template](.github/PULL_REQUEST_TEMPLATE.md) before requesting review. Select exactly one option and list the affected manifest `name` values:
+
+- **UI Plugin**: an affected plugin provides MCP Apps interactive pages, whether through `ui.surfaces` or a tool's `_meta.ui.resourceUri`. Select this even for changes limited to that plugin's docs or skills, or when adding or removing its interactive page.
+- **Standard plugin**: an affected plugin provides no MCP Apps interactive page. MCP tools alone, or a skill that generates Gen UI, do not make a plugin a UI Plugin.
+- **Not applicable**: only repository-level documentation, build, or CI changes; no installable plugin content changes.
+
+If more than one plugin is affected, list each name and type, and select UI Plugin if any is affected. This declaration does not replace the marketplace `category` or the Conventional Commits title. Reviewers must confirm it is complete and accurate before approving.
+
 In the pull request description, include:
 
 - what user problem the change solves;
@@ -57,6 +68,7 @@ In the pull request description, include:
 
 Before requesting review, confirm:
 
+- [ ] the required plugin type is selected and affected plugin names are listed;
 - [ ] the plugin name is unique and kebab-case;
 - [ ] required files and both language READMEs are present;
 - [ ] the category is correct;
 
@@ -14,7 +14,7 @@
 
 每个插件都必须：
 
-- 位于 `plugins/` 下唯一的 kebab-case 目录；
+- 外部团队、合作方和社区新增插件位于 `external_plugins/` 下唯一的 kebab-case 目录；`plugins/` 保留给官方维护插件；
 - 包含 `.zcode-plugin/plugin.json`，并填写 `name`、`description`、`version` 和 `author`；
 - 在根目录 [`marketplace.json`](./marketplace.json) 中注册，且 `name`、`version` 和描述保持一致；
 - 至少提供一种有效组件：command、skill、hook、agent 或 MCP server；
@@ -31,7 +31,8 @@
 2. 复制示例插件，或在本次改动涉及的现有插件中修改：
 
    ```shell
-   cp -R plugins/example-plugin plugins/<你的插件名>
+   mkdir -p external_plugins
+   cp -R plugins/example-plugin external_plugins/<你的插件名>
    ```
 
 3. 更新插件清单、组件文件、两种语言的 README 和根目录市场条目，确保清单与市场条目的版本一致。
@@ -47,6 +48,16 @@
 
 ## Pull Request 自查清单
 
+### 声明插件类型（必填）
+
+每个 PR 在发起评审前都必须填写 [PR 模板](.github/PULL_REQUEST_TEMPLATE.md) 中的 **插件类型**，且只能勾选一项，同时列出涉及插件的清单 `name`：
+
+- **UI Plugin**：涉及的插件提供 MCP Apps 交互页面，包括 `ui.surfaces` 面板或工具的 `_meta.ui.resourceUri` 页面。即使只改该插件的文档或 skill，或者本次新增、移除交互页面，也选择此项。
+- **普通插件（非 UI）**：涉及的插件不提供 MCP Apps 交互页面。仅有 MCP 工具，或 skill 会生成 Gen UI，都不会使其成为 UI Plugin。
+- **不适用**：仅修改仓库级文档、构建或 CI，不涉及可安装插件的内容。
+
+涉及多个插件时，分别列出名称和类型，只要包含 UI Plugin 就选择 UI Plugin。这项声明不替代市场 `category` 分类，也不改变 Conventional Commits 标题要求。评审者批准前必须确认声明完整且准确。
+
 Pull Request 描述中请写清：
 
 - 改动解决的用户问题；
@@ -57,6 +68,7 @@ Pull Request 描述中请写清：
 
 发起评审前确认：
 
+- [ ] 已勾选必填的插件类型，并列出涉及的插件名称；
 - [ ] 插件名唯一且为 kebab-case；
 - [ ] 必需文件和中英文 README 均已提供；
 - [ ] 分类填写正确；