refactor: keep plugin sdk owner seams explicit

extensions/bluebubbles/src/attachments.test.ts

@@ -1,4 +1,4 @@
-import type { PluginRuntime } from "openclaw/plugin-sdk/bluebubbles";
+import type { PluginRuntime } from "openclaw/plugin-sdk/core";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import "./test-mocks.js";
 import {

extensions/bluebubbles/src/test-support/monitor-test-support.ts

@@ -1,4 +1,5 @@
-import type { HistoryEntry, PluginRuntime } from "openclaw/plugin-sdk/bluebubbles";
+import type { PluginRuntime } from "openclaw/plugin-sdk/core";
+import type { HistoryEntry } from "openclaw/plugin-sdk/reply-history";
 import { vi } from "vitest";
 import { createPluginRuntimeMock } from "../../../../test/helpers/plugins/plugin-runtime-mock.js";
 import { _resetBlueBubblesInboundDedupForTest } from "../inbound-dedupe.js";

extensions/matrix/src/cli.test.ts

@@ -1,7 +1,7 @@
 import { Command } from "commander";
-import { formatZonedTimestamp } from "openclaw/plugin-sdk/matrix-runtime-shared";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { registerMatrixCli, resetMatrixCliStateForTests } from "./cli.js";
+import { formatZonedTimestamp } from "./runtime-api.js";
 import type { CoreConfig } from "./types.js";
 
 const bootstrapMatrixVerificationMock = vi.fn();

extensions/mattermost/src/mattermost/slash-http.send-config.test.ts

@@ -1,6 +1,7 @@
 import { ServerResponse, type IncomingMessage } from "node:http";
 import { PassThrough } from "node:stream";
-import type { OpenClawConfig, RuntimeEnv } from "openclaw/plugin-sdk/mattermost";
+import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+import type { RuntimeEnv } from "openclaw/plugin-sdk/runtime";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ResolvedMattermostAccount } from "./accounts.js";
 

extensions/opencode-go/index.ts

@@ -1,5 +1,5 @@
-import { createOpencodeCatalogApiKeyAuthMethod } from "openclaw/plugin-sdk/opencode";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
+import { createProviderApiKeyAuthMethod } from "openclaw/plugin-sdk/provider-auth-api-key";
 import { PASSTHROUGH_GEMINI_REPLAY_HOOKS } from "openclaw/plugin-sdk/provider-model-shared";
 import { applyOpencodeGoConfig, OPENCODE_GO_DEFAULT_MODEL_REF } from "./api.js";
 import { opencodeGoMediaUnderstandingProvider } from "./media-understanding-provider.js";
@@ -11,6 +11,14 @@ import {
 import { createOpencodeGoDeepSeekV4Wrapper } from "./stream.js";
 
 const PROVIDER_ID = "opencode-go";
+const OPENCODE_SHARED_PROFILE_IDS = ["opencode:default", "opencode-go:default"] as const;
+const OPENCODE_SHARED_HINT = "Shared API key for Zen + Go catalogs";
+const OPENCODE_SHARED_WIZARD_GROUP = {
+  groupId: "opencode",
+  groupLabel: "OpenCode",
+  groupHint: OPENCODE_SHARED_HINT,
+} as const;
+
 export default definePluginEntry({
   id: PROVIDER_ID,
   name: "OpenCode Go Provider",
@@ -22,20 +30,30 @@ export default definePluginEntry({
       docsPath: "/providers/models",
       envVars: ["OPENCODE_API_KEY", "OPENCODE_ZEN_API_KEY"],
       auth: [
-        createOpencodeCatalogApiKeyAuthMethod({
+        createProviderApiKeyAuthMethod({
           providerId: PROVIDER_ID,
+          methodId: "api-key",
           label: "OpenCode Go catalog",
+          hint: OPENCODE_SHARED_HINT,
           optionKey: "opencodeGoApiKey",
           flagName: "--opencode-go-api-key",
+          envVar: "OPENCODE_API_KEY",
+          promptMessage: "Enter OpenCode API key",
+          profileIds: [...OPENCODE_SHARED_PROFILE_IDS],
           defaultModel: OPENCODE_GO_DEFAULT_MODEL_REF,
           applyConfig: (cfg) => applyOpencodeGoConfig(cfg),
+          expectedProviders: ["opencode", "opencode-go"],
           noteMessage: [
             "OpenCode uses one API key across the Zen and Go catalogs.",
             "Go focuses on Kimi, GLM, and MiniMax coding models.",
             "Get your API key at: https://opencode.ai/auth",
           ].join("\n"),
-          choiceId: "opencode-go",
-          choiceLabel: "OpenCode Go catalog",
+          noteTitle: "OpenCode",
+          wizard: {
+            choiceId: "opencode-go",
+            choiceLabel: "OpenCode Go catalog",
+            ...OPENCODE_SHARED_WIZARD_GROUP,
+          },
         }),
       ],
       normalizeConfig: ({ providerConfig }) => {

extensions/opencode/index.ts

@@ -1,5 +1,5 @@
-import { createOpencodeCatalogApiKeyAuthMethod } from "openclaw/plugin-sdk/opencode";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
+import { createProviderApiKeyAuthMethod } from "openclaw/plugin-sdk/provider-auth-api-key";
 import {
   matchesExactOrPrefix,
   PASSTHROUGH_GEMINI_REPLAY_HOOKS,
@@ -10,6 +10,13 @@ import { opencodeMediaUnderstandingProvider } from "./media-understanding-provid
 
 const PROVIDER_ID = "opencode";
 const MINIMAX_MODERN_MODEL_MATCHERS = ["minimax-m2.7"] as const;
+const OPENCODE_SHARED_PROFILE_IDS = ["opencode:default", "opencode-go:default"] as const;
+const OPENCODE_SHARED_HINT = "Shared API key for Zen + Go catalogs";
+const OPENCODE_SHARED_WIZARD_GROUP = {
+  groupId: "opencode",
+  groupLabel: "OpenCode",
+  groupHint: OPENCODE_SHARED_HINT,
+} as const;
 
 function isModernOpencodeModel(modelId: string): boolean {
   const lower = normalizeLowercaseStringOrEmpty(modelId);
@@ -30,21 +37,31 @@ export default definePluginEntry({
       docsPath: "/providers/models",
       envVars: ["OPENCODE_API_KEY", "OPENCODE_ZEN_API_KEY"],
       auth: [
-        createOpencodeCatalogApiKeyAuthMethod({
+        createProviderApiKeyAuthMethod({
           providerId: PROVIDER_ID,
+          methodId: "api-key",
           label: "OpenCode Zen catalog",
+          hint: OPENCODE_SHARED_HINT,
           optionKey: "opencodeZenApiKey",
           flagName: "--opencode-zen-api-key",
+          envVar: "OPENCODE_API_KEY",
+          promptMessage: "Enter OpenCode API key",
+          profileIds: [...OPENCODE_SHARED_PROFILE_IDS],
           defaultModel: OPENCODE_ZEN_DEFAULT_MODEL,
           applyConfig: (cfg) => applyOpencodeZenConfig(cfg),
+          expectedProviders: ["opencode", "opencode-go"],
           noteMessage: [
             "OpenCode uses one API key across the Zen and Go catalogs.",
             "Zen provides access to Claude, GPT, Gemini, and more models.",
             "Get your API key at: https://opencode.ai/auth",
             "Choose the Zen catalog when you want the curated multi-model proxy.",
           ].join("\n"),
-          choiceId: "opencode-zen",
-          choiceLabel: "OpenCode Zen catalog",
+          noteTitle: "OpenCode",
+          wizard: {
+            choiceId: "opencode-zen",
+            choiceLabel: "OpenCode Zen catalog",
+            ...OPENCODE_SHARED_WIZARD_GROUP,
+          },
         }),
       ],
       ...PASSTHROUGH_GEMINI_REPLAY_HOOKS,

extensions/telegram/src/command-ui.ts

@@ -1,5 +1,4 @@
 import type { ReplyPayload } from "openclaw/plugin-sdk/reply-runtime";
-import { buildCommandsPaginationKeyboard } from "openclaw/plugin-sdk/telegram-command-ui";
 import {
   buildBrowseProvidersButton,
   buildModelsKeyboard,
@@ -7,7 +6,35 @@ import {
   type ProviderInfo,
 } from "./model-buttons.js";
 
-export { buildCommandsPaginationKeyboard };
+export function buildCommandsPaginationKeyboard(
+  currentPage: number,
+  totalPages: number,
+  agentId?: string,
+): Array<Array<{ text: string; callback_data: string }>> {
+  const buttons: Array<{ text: string; callback_data: string }> = [];
+  const suffix = agentId ? `:${agentId}` : "";
+
+  if (currentPage > 1) {
+    buttons.push({
+      text: "◀ Prev",
+      callback_data: `commands_page_${currentPage - 1}${suffix}`,
+    });
+  }
+
+  buttons.push({
+    text: `${currentPage}/${totalPages}`,
+    callback_data: `commands_page_noop${suffix}`,
+  });
+
+  if (currentPage < totalPages) {
+    buttons.push({
+      text: "Next ▶",
+      callback_data: `commands_page_${currentPage + 1}${suffix}`,
+    });
+  }
+
+  return [buttons];
+}
 
 export function buildTelegramModelsMenuButtons(params: { providers: ProviderInfo[] }) {
   return buildProviderKeyboard(params.providers);