perf: trim gateway startup plugin imports

steipete · steipete · commit 86fc9e3279d1 · 2026-05-04T07:32:37.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ Docs: https://docs.openclaw.ai
 
 ### Changes
 
-- Gateway/startup: keep model-catalog test helpers and run-session lookup code out of the hot `server.impl` import graph, reducing default gateway benchmark readiness latency.
+- Gateway/startup: keep model-catalog test helpers, run-session lookup code, QR pairing helpers, and TypeBox memory-tool schema construction out of hot startup import paths, reducing default gateway benchmark plugin-load and memory pressure.
 - Channels/streaming: add unified `streaming.mode: "progress"` drafts with auto single-word status labels and shared progress configuration across Discord, Telegram, Matrix, Slack, and Microsoft Teams.
 - Slack/streaming: add `streaming.progress.render: "rich"` for Block Kit progress drafts backed by structured progress line data.
 - Slack/streaming: keep the newest rich progress lines when Block Kit limits trim long progress drafts. Thanks @vincentkoc.
diff --git a/extensions/device-pair/index.ts b/extensions/device-pair/index.ts
@@ -1,40 +1,41 @@
 import { rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { definePluginEntry, type OpenClawPluginApi } from "openclaw/plugin-sdk/plugin-entry";
 import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalString,
 } from "openclaw/plugin-sdk/text-runtime";
-import {
-  clearDeviceBootstrapTokens,
-  definePluginEntry,
-  issueDeviceBootstrapToken,
-  listDevicePairing,
-  PAIRING_SETUP_BOOTSTRAP_PROFILE,
-  renderQrPngDataUrl,
-  writeQrPngTempFile,
-  revokeDeviceBootstrapToken,
-  resolveGatewayBindUrl,
-  resolveGatewayPort,
-  resolvePreferredOpenClawTmpDir,
-  runPluginCommandWithTimeout,
-  resolveTailnetHostWithRunner,
-  type OpenClawPluginApi,
-} from "./api.js";
-import {
-  armPairNotifyOnce,
-  formatPendingRequests,
-  handleNotifyCommand,
-  registerPairingNotifierService,
-} from "./notify.js";
-import {
-  approvePendingPairingRequest,
-  selectPendingApprovalRequest,
-} from "./pair-command-approve.js";
-import {
-  buildMissingPairingScopeReply,
-  resolvePairingCommandAuthState,
-} from "./pair-command-auth.js";
+
+type DevicePairApiModule = typeof import("./api.js");
+type NotifyModule = typeof import("./notify.js");
+type PairCommandApproveModule = typeof import("./pair-command-approve.js");
+type PairCommandAuthModule = typeof import("./pair-command-auth.js");
+
+let devicePairApiModulePromise: Promise<DevicePairApiModule> | undefined;
+let notifyModulePromise: Promise<NotifyModule> | undefined;
+let pairCommandApproveModulePromise: Promise<PairCommandApproveModule> | undefined;
+let pairCommandAuthModulePromise: Promise<PairCommandAuthModule> | undefined;
+
+function loadDevicePairApiModule(): Promise<DevicePairApiModule> {
+  devicePairApiModulePromise ??= import("./api.js");
+  return devicePairApiModulePromise;
+}
+
+function loadNotifyModule(): Promise<NotifyModule> {
+  notifyModulePromise ??= import("./notify.js");
+  return notifyModulePromise;
+}
+
+function loadPairCommandApproveModule(): Promise<PairCommandApproveModule> {
+  pairCommandApproveModulePromise ??= import("./pair-command-approve.js");
+  return pairCommandApproveModulePromise;
+}
+
+function loadPairCommandAuthModule(): Promise<PairCommandAuthModule> {
+  pairCommandAuthModulePromise ??= import("./pair-command-auth.js");
+  return pairCommandAuthModulePromise;
+}
 
 function formatDurationMinutes(expiresAtMs: number): string {
   const msRemaining = Math.max(0, expiresAtMs - Date.now());
@@ -254,6 +255,8 @@ function pickTailnetIPv4(): string | null {
 }
 
 async function resolveTailnetHost(): Promise<string | null> {
+  const { resolveTailnetHostWithRunner, runPluginCommandWithTimeout } =
+    await loadDevicePairApiModule();
   return await resolveTailnetHostWithRunner((argv, opts) =>
     runPluginCommandWithTimeout({
       argv,
@@ -307,6 +310,7 @@ function resolveRequiredAuthLabel(
 }
 
 async function resolveGatewayUrl(api: OpenClawPluginApi): Promise<ResolveUrlResult> {
+  const { resolveGatewayBindUrl, resolveGatewayPort } = await loadDevicePairApiModule();
   const cfg = api.config;
   const pluginCfg = (api.pluginConfig ?? {}) as DevicePairPluginConfig;
   const scheme = resolveScheme(cfg);
@@ -511,6 +515,8 @@ function issuesPairSetupCode(action: string): boolean {
 }
 
 async function issueSetupPayload(url: string): Promise<SetupPayload> {
+  const { issueDeviceBootstrapToken, PAIRING_SETUP_BOOTSTRAP_PROFILE } =
+    await loadDevicePairApiModule();
   const issuedBootstrap = await issueDeviceBootstrapToken({
     profile: PAIRING_SETUP_BOOTSTRAP_PROFILE,
   });
@@ -558,7 +564,19 @@ export default definePluginEntry({
   name: "Device Pair",
   description: "QR/bootstrap pairing helpers for OpenClaw devices",
   register(api: OpenClawPluginApi) {
-    registerPairingNotifierService(api);
+    let notifierService: ReturnType<NotifyModule["createPairingNotifierService"]> | undefined;
+    api.registerService({
+      id: "device-pair-notifier",
+      start: async (ctx) => {
+        const { createPairingNotifierService } = await loadNotifyModule();
+        notifierService = createPairingNotifierService(api);
+        await notifierService.start(ctx);
+      },
+      stop: async (ctx) => {
+        await notifierService?.stop?.(ctx);
+        notifierService = undefined;
+      },
+    });
 
     api.registerCommand({
       name: "pair",
@@ -571,6 +589,8 @@ export default definePluginEntry({
         const gatewayClientScopes = Array.isArray(ctx.gatewayClientScopes)
           ? ctx.gatewayClientScopes
           : undefined;
+        const { buildMissingPairingScopeReply, resolvePairingCommandAuthState } =
+          await loadPairCommandAuthModule();
         const authState = resolvePairingCommandAuthState({
           channel: ctx.channel,
           gatewayClientScopes,
@@ -582,12 +602,17 @@ export default definePluginEntry({
         );
 
         if (action === "status" || action === "pending") {
+          const [{ listDevicePairing }, { formatPendingRequests }] = await Promise.all([
+            loadDevicePairApiModule(),
+            loadNotifyModule(),
+          ]);
           const list = await listDevicePairing();
           return { text: formatPendingRequests(list.pending) };
         }
 
         if (action === "notify") {
           const notifyAction = normalizeLowercaseStringOrEmpty(tokens[1]) || "status";
+          const { handleNotifyCommand } = await loadNotifyModule();
           return await handleNotifyCommand({
             api,
             ctx,
@@ -599,6 +624,10 @@ export default definePluginEntry({
           if (authState.isMissingInternalPairingPrivilege) {
             return buildMissingPairingScopeReply();
           }
+          const [
+            { listDevicePairing },
+            { approvePendingPairingRequest, selectPendingApprovalRequest },
+          ] = await Promise.all([loadDevicePairApiModule(), loadPairCommandApproveModule()]);
           const list = await listDevicePairing();
           const selected = selectPendingApprovalRequest({
             pending: list.pending,
@@ -621,6 +650,7 @@ export default definePluginEntry({
           if (authState.isMissingInternalPairingPrivilege) {
             return buildMissingPairingScopeReply();
           }
+          const { clearDeviceBootstrapTokens } = await loadDevicePairApiModule();
           const cleared = await clearDeviceBootstrapTokens();
           return {
             text:
@@ -651,6 +681,7 @@ export default definePluginEntry({
 
           if (channel === "telegram" && target) {
             try {
+              const { armPairNotifyOnce } = await loadNotifyModule();
               autoNotifyArmed = await armPairNotifyOnce({ api, ctx });
             } catch (err) {
               api.logger.warn?.(
@@ -672,6 +703,8 @@ export default definePluginEntry({
           if (target && canSendQrPngToChannel(channel)) {
             let qrFilePath: string | undefined;
             try {
+              const { resolvePreferredOpenClawTmpDir, writeQrPngTempFile } =
+                await loadDevicePairApiModule();
               qrFilePath = (
                 await writeQrPngTempFile(setupCode, {
                   tmpRoot: resolvePreferredOpenClawTmpDir(),
@@ -697,6 +730,7 @@ export default definePluginEntry({
                 };
               }
             } catch (err) {
+              const { revokeDeviceBootstrapToken } = await loadDevicePairApiModule();
               api.logger.warn?.(
                 `device-pair: QR image send failed channel=${channel}, falling back (${(err as Error)?.message ?? err})`,
               );
@@ -716,8 +750,10 @@ export default definePluginEntry({
           if (channel === "webchat") {
             let qrDataUrl: string;
             try {
+              const { renderQrPngDataUrl } = await loadDevicePairApiModule();
               qrDataUrl = await renderQrPngDataUrl(setupCode);
             } catch (err) {
+              const { revokeDeviceBootstrapToken } = await loadDevicePairApiModule();
               api.logger.warn?.(
                 `device-pair: webchat QR render failed, falling back (${(err as Error)?.message ?? err})`,
               );
diff --git a/extensions/device-pair/notify.ts b/extensions/device-pair/notify.ts
@@ -1,9 +1,10 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
+import type { OpenClawPluginService } from "openclaw/plugin-sdk/core";
+import { listDevicePairing } from "openclaw/plugin-sdk/device-bootstrap";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/plugin-entry";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
-import type { OpenClawPluginApi } from "./api.js";
-import { listDevicePairing } from "./api.js";
 
 const NOTIFY_STATE_FILE = "device-pair-notify.json";
 const NOTIFY_POLL_INTERVAL_MS = 10_000;
@@ -488,10 +489,10 @@ export async function handleNotifyCommand(params: {
   return { text: "Usage: /pair notify on|off|once|status" };
 }
 
-export function registerPairingNotifierService(api: OpenClawPluginApi): void {
+export function createPairingNotifierService(api: OpenClawPluginApi): OpenClawPluginService {
   let notifyInterval: ReturnType<typeof setInterval> | null = null;
 
-  api.registerService({
+  return {
     id: "device-pair-notifier",
     start: async (ctx) => {
       const statePath = resolveNotifyStatePath(ctx.stateDir);
@@ -502,7 +503,6 @@ export function registerPairingNotifierService(api: OpenClawPluginApi): void {
       await tick().catch((err) => {
         api.logger.warn(`device-pair: initial notify poll failed: ${formatErrorMessage(err)}`);
       });
-
       notifyInterval = setInterval(() => {
         tick().catch((err) => {
           api.logger.warn(`device-pair: notify poll failed: ${formatErrorMessage(err)}`);
@@ -516,5 +516,9 @@ export function registerPairingNotifierService(api: OpenClawPluginApi): void {
         notifyInterval = null;
       }
     },
-  });
+  };
+}
+
+export function registerPairingNotifierService(api: OpenClawPluginApi): void {
+  api.registerService(createPairingNotifierService(api));
 }
diff --git a/extensions/memory-core/index.ts b/extensions/memory-core/index.ts
@@ -11,7 +11,7 @@ import {
   type AnyAgentTool,
   type OpenClawPluginToolContext,
 } from "openclaw/plugin-sdk/plugin-entry";
-import { Type } from "typebox";
+import type { TSchema } from "typebox";
 import { registerShortTermPromotionDreaming } from "./src/dreaming.js";
 import { buildMemoryFlushPlan } from "./src/flush-plan.js";
 import { registerBuiltInMemoryEmbeddingProviders } from "./src/memory/provider-adapters.js";
@@ -58,28 +58,29 @@ function hasMemoryToolContext(options: MemoryToolOptions): boolean {
   return Boolean(resolveMemorySearchConfig(cfg, agentId));
 }
 
-const MemorySearchSchema = Type.Object({
-  query: Type.String(),
-  maxResults: Type.Optional(Type.Number()),
-  minScore: Type.Optional(Type.Number()),
-  corpus: Type.Optional(
-    Type.Union([
-      Type.Literal("memory"),
-      Type.Literal("wiki"),
-      Type.Literal("all"),
-      Type.Literal("sessions"),
-    ]),
-  ),
-});
-
-const MemoryGetSchema = Type.Object({
-  path: Type.String(),
-  from: Type.Optional(Type.Number()),
-  lines: Type.Optional(Type.Number()),
-  corpus: Type.Optional(
-    Type.Union([Type.Literal("memory"), Type.Literal("wiki"), Type.Literal("all")]),
-  ),
-});
+const MemorySearchSchema = {
+  type: "object",
+  properties: {
+    query: { type: "string" },
+    maxResults: { type: "number" },
+    minScore: { type: "number" },
+    corpus: { type: "string", enum: ["memory", "wiki", "all", "sessions"] },
+  },
+  required: ["query"],
+  additionalProperties: false,
+} as const satisfies TSchema;
+
+const MemoryGetSchema = {
+  type: "object",
+  properties: {
+    path: { type: "string" },
+    from: { type: "number" },
+    lines: { type: "number" },
+    corpus: { type: "string", enum: ["memory", "wiki", "all"] },
+  },
+  required: ["path"],
+  additionalProperties: false,
+} as const satisfies TSchema;
 
 function createLazyMemoryTool(params: {
   options: MemoryToolOptions;
