Nikola Metulev (nmetulev) · Oct 7, 2026 · Oct 6, 2026 · Oct 7, 2026 · Oct 7, 2026 · Oct 7, 2026
@@ -1,14 +1,31 @@
 {
-  "name": "microsoft-winui",
+  "name": "win-dev-skills",
   "interface": {
-    "displayName": "Microsoft WinUI"
+    "displayName": "Windows app development"
   },
   "plugins": [
     {
       "name": "winui",
       "source": {
-        "source": "local",
-        "path": "./plugins/winui"
+        "source": "git-subdir",
+        "url": "https://github.com/microsoft/winappCli.git",
+        "path": "plugins/winui",
+        "sha": "5a064a427f1e056822a939b13ddce43b798090fa"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Developer Tools"
+    },
+    {
+      "name": "winappcli",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/microsoft/winappCli.git",
+        "path": "plugins/winapp",
+        "ref": "v0.7.1",
+        "sha": "e3cd0b94f3e7b776ac51ba0564f4908094e979b5"
       },
       "policy": {
         "installation": "AVAILABLE",

@@ -4,14 +4,19 @@
     "name": "Microsoft",
     "url": "https://github.com/microsoft/win-dev-skills"
   },
-  "description": "Agents and skills for native Windows app development with WinUI 3 and the Windows App SDK.",
+  "description": "Agents and skills for Windows app development.",
   "version": "0.7.1",
   "plugins": [
     {
       "name": "winui",
       "description": "Agents and skills for WinUI 3 app development. Create new WinUI 3 desktop apps, convert from other frameworks to WinUI 3, or add features to existing WinUI 3 applications.",
       "version": "0.7.1",
-      "source": "./plugins/winui",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/microsoft/winappCli.git",
+        "path": "plugins/winui",
+        "sha": "5a064a427f1e056822a939b13ddce43b798090fa"
+      },
       "category": "windows-development",
       "tags": [
         "windows",
@@ -28,7 +33,39 @@
         "url": "https://github.com/microsoft/win-dev-skills"
       },
       "homepage": "https://github.com/microsoft/win-dev-skills",
-      "repository": "https://github.com/microsoft/win-dev-skills",
+      "repository": "https://github.com/microsoft/winappCli",
+      "license": "MIT"
+    },
+    {
+      "name": "winappcli",
+      "description": "Windows app development, packaging, and distribution. Helps with creating Windows installers (MSIX), code signing, certificates, Windows SDK and Windows App SDK setup, package identity for Windows APIs (push notifications, background tasks, share target), appxmanifest authoring, and Microsoft Store distribution. Supports Electron, .NET, C++, Rust, Flutter, and Tauri apps.",
+      "version": "0.7.1",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/microsoft/winappCli.git",
+        "path": "plugins/winapp",
+        "ref": "v0.7.1",
+        "sha": "e3cd0b94f3e7b776ac51ba0564f4908094e979b5"
+      },
+      "category": "windows-development",
+      "tags": [
+        "windows",
+        "msix",
+        "packaging",
+        "installer",
+        "desktop",
+        "notifications",
+        "sdk",
+        "signing",
+        "certificate",
+        "distribution"
+      ],
+      "author": {
+        "name": "Microsoft",
+        "url": "https://github.com/microsoft/winappCli"
+      },
+      "homepage": "https://github.com/microsoft/winappCli",
+      "repository": "https://github.com/microsoft/winappCli",
       "license": "MIT"
     }
   ]

@@ -0,0 +1,19 @@
+# Catalog maintainers review everything by default. They're the repo
+# maintainers who have been landing changes here.
+* @nmetulev @azchohfi @niels9001
+
+# Catalog files: adding, removing, or re-pinning a plugin.
+/.github/plugin/marketplace.json @nmetulev @azchohfi @niels9001
+/.claude-plugin/marketplace.json @nmetulev @azchohfi @niels9001
+/.agents/plugins/marketplace.json @nmetulev @azchohfi @niels9001
+
+# CI and catalog tooling
+/.github/workflows/ @nmetulev @azchohfi @niels9001
+/scripts/ @nmetulev @azchohfi @niels9001
+
+# Plugins stored in this repo: one entry per plugin, owned by two or more
+# people or a team. Template:
+# /plugins/<name>/ @owner1 @owner2
+#
+# winui and winappcli are maintained in microsoft/winappCli and reviewed
+# there; their catalog entries are covered above.
@@ -1,5 +1,5 @@
 name: Bug report
-description: Report a bug in a skill, plugin, or agent guidance
+description: Report a catalog or plugin install problem
 title: "[Bug]: "
 labels: ["bug"]
 body:
@@ -8,9 +8,7 @@ body:
       value: |
         Thanks for taking the time to file a bug report!
 
-        **WinApp CLI or WinUI analyzer bug?** Please [open an issue in microsoft/winappCli](https://github.com/microsoft/winappCli/issues/new/choose) for analyzer diagnostics/package issues or tool behavior in `find-api`, `run`, packaging, and Windows Sandbox. Use this form for incorrect skill/agent guidance or plugin integration.
-
-        💡 **The single most useful thing you can attach** is a `session-report.md` from the **`winui-session-report`** skill — it captures the agent's tool calls, build output, and timing in a structured way.
+        **Problem with a `winui` or `winappcli` skill or agent, WinApp CLI, or the analyzer?** Please [open an issue in microsoft/winappCli](https://github.com/microsoft/winappCli/issues/new/choose), where those plugins are authored. Use this form for catalog and install problems (e.g. `plugin marketplace add`, `plugin install`, or `plugin update` fails).
   - type: textarea
     id: description
     attributes:
@@ -21,20 +19,16 @@ body:
   - type: dropdown
     id: area
     attributes:
-      label: Affected skill / tool
-      description: Which part of the repo is affected? (Pick the closest match — leave as "Not sure" if unclear.)
+      label: Affected host
+      description: Which agent host shows the problem?
       options:
         - Not sure
-        - "skill: winui (agent)"
-        - "skill: winui-dev-workflow"
-        - "skill: winui-design"
-        - "skill: winui-code-review"
-        - "skill: winui-ui-testing"
-        - "skill: winui-packaging"
-        - "skill: winui-session-report"
-        - "skill: winui-wpf-migration"
-        - "area: plugin / install"
-        - "area: docs"
+        - GitHub Copilot
+        - Claude Code
+        - OpenAI Codex
+        - OpenClaw
+        - OpenCode
+        - Other
     validations:
       required: true
   - type: textarea
@@ -43,8 +37,8 @@ body:
       label: To Reproduce
       description: Steps to reproduce the behavior.
       placeholder: |
-        1. Run `copilot --agent winui:winui-dev`
-        2. Ask "..."
+        1. Run `copilot plugin marketplace add microsoft/win-dev-skills`
+        2. Run `copilot plugin install winui@win-dev-skills`
         3. See error
     validations:
       required: true
@@ -55,36 +49,28 @@ body:
       description: A clear and concise description of what you expected to happen.
     validations:
       required: true
-  - type: textarea
-    id: session-report
-    attributes:
-      label: Session report (strongly recommended)
-      description: Paste or attach the `session-report.md` produced by the `winui-session-report` skill, or the relevant excerpt.
-      render: markdown
-    validations:
-      required: false
   - type: textarea
     id: logs
     attributes:
-      label: Build / runtime output
-      description: Paste any relevant build errors, stack traces, or log output.
+      label: Command output
+      description: Paste the full output of the failing command.
       render: shell
     validations:
       required: false
   - type: input
     id: copilot-version
     attributes:
-      label: Copilot CLI version
-      description: Output of `copilot --version`
-      placeholder: e.g. 1.0.36
+      label: Host version
+      description: e.g. output of `copilot --version`, `claude --version`, or `codex --version`
+      placeholder: e.g. 1.0.87
     validations:
       required: false
   - type: input
     id: plugin-version
     attributes:
       label: Plugin version
-      description: From `plugins/winui/agent-plugin/plugin.json` of the installed plugin
-      placeholder: e.g. 0.3.0
+      description: From your host's plugin list (e.g. `copilot plugin list`)
+      placeholder: e.g. 0.7.1
     validations:
       required: false
   - type: input
@@ -94,14 +80,6 @@ body:
       description: e.g. Windows 11 23H2 (build 22631.4317)
     validations:
       required: false
-  - type: input
-    id: dotnet-sdk
-    attributes:
-      label: .NET SDK version
-      description: Output of `dotnet --version`
-      placeholder: e.g. 10.0.100
-    validations:
-      required: false
   - type: textarea
     id: additional
     attributes:

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: WinApp CLI or WinUI analyzer bug
+  - name: winui or winappcli plugin issue
     url: https://github.com/microsoft/winappCli/issues/new/choose
-    about: Report analyzer diagnostics/package issues and find-api, run, packaging, or Windows Sandbox tool bugs in the WinApp repository.
+    about: The winui and winappcli plugins are authored in microsoft/winappCli. File their skill and agent issues, and WinApp CLI and analyzer issues, there.
   - name: Question / discussion
     url: https://github.com/microsoft/win-dev-skills/discussions
     about: Have a question about how to use a skill, or want to discuss an idea? Start a Discussion.

@@ -6,13 +6,13 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to flag a documentation issue! Broken cross-references between skills, outdated examples, and missing prerequisites are especially valuable to know about.
+        Thanks for taking the time to flag a documentation issue! **Problem in a `winui` or `winappcli` skill or agent?** Please [open it in microsoft/winappCli](https://github.com/microsoft/winappCli/issues/new/choose), where those plugins are authored. Use this form for this repo's README and docs.
   - type: textarea
     id: location
     attributes:
       label: Where is the issue?
-      description: Link to the specific page, file, or section. For SKILL.md files, please include the skill name and line number.
-      placeholder: e.g. plugins/winui/agent-plugin/skills/winui-code-review/SKILL.md line 15
+      description: Link to the specific page, file, or section.
+      placeholder: e.g. README.md, "Install" section
     validations:
       required: true
   - type: textarea

@@ -8,7 +8,7 @@ body:
       value: |
         Thanks for taking the time to suggest a new feature!
 
-        If you're proposing a brand-new skill (e.g., "Add an XAML Behaviors skill"), include enough detail that someone else on the team or in the community could pick it up and implement it.
+        **Idea for the `winui` or `winappcli` skills or agents?** Please [open it in microsoft/winappCli](https://github.com/microsoft/winappCli/issues/new/choose). Use this form to propose a new plugin for this catalog or a catalog improvement.
   - type: textarea
     id: problem
     attributes:

@@ -1,8 +1,7 @@
 <!--
-Base branch: this PR should target `staging`, not `main`.
-PRs to `main` are reserved for the promotion PR (cut by maintainers from
-`staging`) and `hotfix/*` branches. See CONTRIBUTING.md for the flow.
-The `pr-target-policy` CI check enforces this.
+Changing winui or winappcli skills, agents, or manifests? Open the PR in microsoft/winappCli
+instead: https://github.com/microsoft/winappCli
+This repo holds the plugin catalog. See CONTRIBUTING.md.
 -->
 
 ## Description
@@ -17,39 +16,17 @@ The `pr-target-policy` CI check enforces this.
 
 <!-- Keep the applicable line(s), delete the rest -->
 
-- 🐛 Bug fix
-- ✨ New skill or feature
-- 💥 Breaking change (skill API, agent config, plugin layout)
+- 📦 Catalog entry added, moved to a new pin, or removed
 - 📝 Documentation
-- 🔧 Config / build / CI
-- ♻️ Refactoring
-- 🧪 Test update
-
-## Affected area
-
-<!-- Check all that apply -->
-
-- [ ] Agent (`plugins/winui/agents/`, `plugins/winui/agent-plugin/com.github.copilot/agents/`)
-- [ ] Skill: <!-- name(s) -->
-- [ ] Script: <!-- Analyze-Session.ps1 / workflow regressions / release helper -->
-- [ ] Plugin metadata (`plugin.json`, `plugins/winui/`)
-- [ ] Repo-level docs / governance
+- 🔧 Config / CI
 
 ## Checklist
 
 <!-- Delete the ones that do not apply -->
 
-- [ ] Tested locally on Windows (build + agent invocation if applicable)
-- [ ] If a skill changed: `SKILL.md` frontmatter still valid; cross-references to other skills still resolve
-- [ ] If a `.ps1` script changed: tested under default `RemoteSigned` execution policy
-- [ ] If a CLI command or agent invocation changed: `README.md` updated
-- [ ] New tests added for new functionality (if applicable)
+- [ ] All three catalogs (`.github/plugin`, `.claude-plugin`, `.agents/plugins`) list the same plugins at the same pin
+- [ ] Installed the plugin from this branch on each host and confirmed its skills load
 - [ ] If user-facing: added a bullet to `## [Unreleased]` in `CHANGELOG.md`
-- [ ] Did **not** edit any `version` field in `plugins/winui/agent-plugin/plugin.json`, `.github/plugin/marketplace.json`, or `.claude-plugin/marketplace.json` (versions bump only on the `staging → main` promotion PR — see [`RELEASING.md`](../RELEASING.md))
-
-## Screenshots / Demo
-
-<!-- If applicable, add screenshots, agent transcript snippets, or GIFs demonstrating the changes -->
 
 ## Additional Notes
 

@@ -5,15 +5,32 @@
     "url": "https://github.com/microsoft/win-dev-skills"
   },
   "metadata": {
-    "description": "Agents and skills for native Windows app development with WinUI 3 and the Windows App SDK.",
+    "description": "Agents and skills for Windows app development.",
     "version": "0.7.1"
   },
   "plugins": [
     {
       "name": "winui",
       "description": "Agents and skills for WinUI 3 app development. Create new WinUI 3 desktop apps, convert from other frameworks to WinUI 3, or add features to existing WinUI 3 applications.",
       "version": "0.7.1",
-      "source": "./plugins/winui/agent-plugin"
+      "source": {
+        "source": "github",
+        "repo": "microsoft/winappCli",
+        "path": "plugins/winui/agent-plugin",
+        "sha": "5a064a427f1e056822a939b13ddce43b798090fa"
+      }
+    },
+    {
+      "name": "winappcli",
+      "description": "Windows app development, packaging, and distribution. Helps with creating Windows installers (MSIX), code signing, certificates, Windows SDK and Windows App SDK setup, package identity for Windows APIs (push notifications, background tasks, share target), appxmanifest authoring, and Microsoft Store distribution. Supports Electron, .NET, C++, Rust, Flutter, and Tauri apps.",
+      "version": "0.7.1",
+      "source": {
+        "source": "github",
+        "repo": "microsoft/winappCli",
+        "path": "plugins/winapp",
+        "ref": "v0.7.1",
+        "sha": "e3cd0b94f3e7b776ac51ba0564f4908094e979b5"
+      }
     }
   ]
 }