From e3d76d2e1f76fb42b4e9f5f90ada268eb0763402 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sat, 2 May 2026 15:32:29 -0700
Subject: [PATCH] fix(channels): keep matrix and mattermost bundled

---
 CHANGELOG.md                                  |  1 +
 extensions/matrix/package.json                | 15 +-----
 extensions/mattermost/package.json            | 12 -----
 package.json                                  |  3 --
 .../official-external-channel-catalog.json    | 46 -------------------
 scripts/lib/optional-bundled-clusters.mjs     |  1 -
 6 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb16f9c0076..462350661eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Channels: keep Matrix and Mattermost bundled in the core package instead of advertising external npm installs before those channels are cut over. Thanks @vincentkoc.
 - CLI/plugins: stop treating the non-plugin `auth` command root as a bundled plugin id, so restrictive `plugins.allow` configs no longer tell users to add stale `auth` plugin entries.
 - Doctor/plugins: update configured plugin installs whose stale manifests still declare channels without `channelConfigs`, so beta upgrades repair old Discord-style package payloads during `doctor --fix`.
 - Active Memory: keep non-empty `memory_search` results from being fast-failed as empty when debug telemetry reports zero hits.
diff --git a/extensions/matrix/package.json b/extensions/matrix/package.json
index 5722acf6f04..28eaa52ab51 100644
--- a/extensions/matrix/package.json
+++ b/extensions/matrix/package.json
@@ -79,20 +79,7 @@
       }
     },
     "install": {
-      "npmSpec": "@openclaw/matrix",
-      "defaultChoice": "npm",
-      "minHostVersion": ">=2026.4.10",
-      "allowInvalidConfigRecovery": true
-    },
-    "compat": {
-      "pluginApi": ">=2026.5.2"
-    },
-    "build": {
-      "openclawVersion": "2026.5.2"
-    },
-    "release": {
-      "publishToClawHub": true,
-      "publishToNpm": true
+      "minHostVersion": ">=2026.4.10"
     }
   }
 }
diff --git a/extensions/mattermost/package.json b/extensions/mattermost/package.json
index 5da2cd14c0d..e8ce4d84436 100644
--- a/extensions/mattermost/package.json
+++ b/extensions/mattermost/package.json
@@ -37,19 +37,7 @@
       "order": 65
     },
     "install": {
-      "npmSpec": "@openclaw/mattermost",
-      "defaultChoice": "npm",
       "minHostVersion": ">=2026.4.10"
-    },
-    "compat": {
-      "pluginApi": ">=2026.5.2"
-    },
-    "build": {
-      "openclawVersion": "2026.5.2"
-    },
-    "release": {
-      "publishToClawHub": true,
-      "publishToNpm": true
     }
   }
 }
diff --git a/package.json b/package.json
index ead82a9724f..c6ba6247567 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "!dist/extensions/acpx/**",
     "!dist/extensions/node_modules/**",
     "!dist/extensions/*/node_modules/**",
-    "!dist/extensions/acpx/**",
     "!dist/extensions/bluebubbles/**",
     "!dist/extensions/brave/**",
     "!dist/extensions/codex/**",
@@ -47,8 +46,6 @@
     "!dist/extensions/googlechat/**",
     "!dist/extensions/line/**",
     "!dist/extensions/lobster/**",
-    "!dist/extensions/matrix/**",
-    "!dist/extensions/mattermost/**",
     "!dist/extensions/memory-lancedb/**",
     "!dist/extensions/msteams/**",
     "!dist/extensions/nextcloud-talk/**",
diff --git a/scripts/lib/official-external-channel-catalog.json b/scripts/lib/official-external-channel-catalog.json
index f5bfccdb6aa..60b95b96eba 100644
--- a/scripts/lib/official-external-channel-catalog.json
+++ b/scripts/lib/official-external-channel-catalog.json
@@ -198,52 +198,6 @@
         }
       }
     },
-    {
-      "name": "@openclaw/matrix",
-      "description": "OpenClaw Matrix channel plugin",
-      "source": "official",
-      "kind": "channel",
-      "openclaw": {
-        "channel": {
-          "id": "matrix",
-          "label": "Matrix",
-          "selectionLabel": "Matrix (plugin)",
-          "docsPath": "/channels/matrix",
-          "docsLabel": "matrix",
-          "blurb": "open protocol; install the plugin to enable.",
-          "order": 70,
-          "quickstartAllowFrom": true
-        },
-        "install": {
-          "npmSpec": "@openclaw/matrix",
-          "defaultChoice": "npm",
-          "minHostVersion": ">=2026.4.10",
-          "allowInvalidConfigRecovery": true
-        }
-      }
-    },
-    {
-      "name": "@openclaw/mattermost",
-      "description": "OpenClaw Mattermost channel plugin",
-      "source": "official",
-      "kind": "channel",
-      "openclaw": {
-        "channel": {
-          "id": "mattermost",
-          "label": "Mattermost",
-          "selectionLabel": "Mattermost (plugin)",
-          "docsPath": "/channels/mattermost",
-          "docsLabel": "mattermost",
-          "blurb": "self-hosted Slack-style chat; install the plugin to enable.",
-          "order": 65
-        },
-        "install": {
-          "npmSpec": "@openclaw/mattermost",
-          "defaultChoice": "npm",
-          "minHostVersion": ">=2026.4.10"
-        }
-      }
-    },
     {
       "name": "@openclaw/msteams",
       "description": "OpenClaw Microsoft Teams channel plugin",
diff --git a/scripts/lib/optional-bundled-clusters.mjs b/scripts/lib/optional-bundled-clusters.mjs
index fc23057f290..27287d54332 100644
--- a/scripts/lib/optional-bundled-clusters.mjs
+++ b/scripts/lib/optional-bundled-clusters.mjs
@@ -3,7 +3,6 @@ const optionalBundledClusters = [
   "diagnostics-otel",
   "diffs",
   "googlechat",
-  "matrix",
   "memory-lancedb",
   "msteams",
   "nostr",