From 83ddb0fb4c7793153fab5841a3c80c758ecacb11 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Mon, 16 Mar 2026 00:55:45 -0700
Subject: [PATCH] Plugins: restore routing seams and discovery fixtures

---
 extensions/discord/src/channel.ts             |  5 ++++
 extensions/imessage/src/channel.ts            |  1 +
 .../contracts/discovery.contract.test.ts      | 26 ++++++++++++++++---
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/extensions/discord/src/channel.ts b/extensions/discord/src/channel.ts
index 13b5d9bb6e8..ac858b9c108 100644
--- a/extensions/discord/src/channel.ts
+++ b/extensions/discord/src/channel.ts
@@ -8,6 +8,11 @@ import {
   createScopedAccountConfigAccessors,
   formatAllowFromLowercase,
 } from "openclaw/plugin-sdk/compat";
+import {
+  buildAgentSessionKey,
+  resolveThreadSessionKeys,
+  type RoutePeer,
+} from "openclaw/plugin-sdk/core";
 import {
   buildComputedAccountStatusSnapshot,
   buildChannelConfigSchema,
diff --git a/extensions/imessage/src/channel.ts b/extensions/imessage/src/channel.ts
index 71526f20564..2d5b0ba9b39 100644
--- a/extensions/imessage/src/channel.ts
+++ b/extensions/imessage/src/channel.ts
@@ -3,6 +3,7 @@ import {
   buildAccountScopedDmSecurityPolicy,
   collectAllowlistProviderRestrictSendersWarnings,
 } from "openclaw/plugin-sdk/compat";
+import { buildAgentSessionKey, type RoutePeer } from "openclaw/plugin-sdk/core";
 import {
   buildChannelConfigSchema,
   collectStatusIssuesFromLastError,
diff --git a/src/plugins/contracts/discovery.contract.test.ts b/src/plugins/contracts/discovery.contract.test.ts
index 6dbc767635d..3fff691b6af 100644
--- a/src/plugins/contracts/discovery.contract.test.ts
+++ b/src/plugins/contracts/discovery.contract.test.ts
@@ -4,6 +4,7 @@ import {
   replaceRuntimeAuthProfileStoreSnapshots,
 } from "../../agents/auth-profiles/store.js";
 import { QWEN_OAUTH_MARKER } from "../../agents/model-auth-markers.js";
+import type { ModelDefinitionConfig } from "../../config/types.models.js";
 import { createCapturedPluginRegistration } from "../../test-utils/plugin-registration.js";
 import { runProviderCatalog } from "../provider-discovery.js";
 import type { OpenClawPluginApi, ProviderPlugin } from "../types.js";
@@ -58,6 +59,23 @@ function requireProvider(providers: ProviderPlugin[], providerId: string) {
   return provider;
 }
 
+function buildTestModel(params: { id: string; name: string }): ModelDefinitionConfig {
+  return {
+    id: params.id,
+    name: params.name,
+    reasoning: false,
+    input: ["text"],
+    cost: {
+      input: 0,
+      output: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+    },
+    contextWindow: 128_000,
+    maxTokens: 8_192,
+  };
+}
+
 describe("provider discovery contract", () => {
   afterEach(() => {
     resolveCopilotApiTokenMock.mockReset();
@@ -226,7 +244,7 @@ describe("provider discovery contract", () => {
             providers: {
               ollama: {
                 baseUrl: "http://ollama-host:11434/v1/",
-                models: [{ id: "llama3.2", name: "llama3.2" }],
+                models: [buildTestModel({ id: "llama3.2", name: "llama3.2" })],
               },
             },
           },
@@ -234,12 +252,12 @@ describe("provider discovery contract", () => {
         env: {} as NodeJS.ProcessEnv,
         resolveProviderApiKey: () => ({ apiKey: undefined }),
       }),
-    ).resolves.toEqual({
+    ).resolves.toMatchObject({
       provider: {
         baseUrl: "http://ollama-host:11434",
         api: "ollama",
         apiKey: "ollama-local",
-        models: [{ id: "llama3.2", name: "llama3.2" }],
+        models: [expect.objectContaining({ id: "llama3.2", name: "llama3.2" })],
       },
     });
     expect(buildOllamaProviderMock).not.toHaveBeenCalled();
@@ -405,6 +423,7 @@ describe("provider discovery contract", () => {
               "minimax-portal": {
                 baseUrl: "https://portal-proxy.example.com/anthropic",
                 apiKey: "explicit-key",
+                models: [],
               },
             },
           },
@@ -431,6 +450,7 @@ describe("provider discovery contract", () => {
             providers: {
               modelstudio: {
                 baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
+                models: [],
               },
             },
           },