From 1ea332a658fb683c54da93d51222ea1cdc1b7a00 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 12 Apr 2026 12:04:59 -0700
Subject: [PATCH] fix: repair CI type checks

---
 extensions/discord/src/monitor/gateway-plugin.ts    |  2 --
 .../src/monitor.watch-subscribe-retry.test.ts       | 13 ++++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/extensions/discord/src/monitor/gateway-plugin.ts b/extensions/discord/src/monitor/gateway-plugin.ts
index e5a644d7af8..3d3e529c163 100644
--- a/extensions/discord/src/monitor/gateway-plugin.ts
+++ b/extensions/discord/src/monitor/gateway-plugin.ts
@@ -248,8 +248,6 @@ function createGatewayPlugin(params: {
   };
 }): carbonGateway.GatewayPlugin {
   class SafeGatewayPlugin extends carbonGateway.GatewayPlugin {
-    declare private firstHeartbeatTimeout: ReturnType<typeof setTimeout> | undefined;
-
     private gatewayInfoUsedFallback = false;
 
     constructor() {
diff --git a/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts b/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts
index b90b0fb20b7..b57d21ed455 100644
--- a/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts
+++ b/extensions/imessage/src/monitor.watch-subscribe-retry.test.ts
@@ -1,6 +1,6 @@
 import type { waitForTransportReady } from "openclaw/plugin-sdk/infra-runtime";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import type { createIMessageRpcClient } from "./client.js";
+import type { createIMessageRpcClient, IMessageRpcClient } from "./client.js";
 import { monitorIMessageProvider } from "./monitor.js";
 import type { attachIMessageMonitorAbortHandler } from "./monitor/abort-handler.js";
 
@@ -31,11 +31,17 @@ function createRuntime() {
   };
 }
 
+type MockIMessageRpcClient = IMessageRpcClient & {
+  request: ReturnType<typeof vi.fn<(method: string) => Promise<unknown>>>;
+  waitForClose: ReturnType<typeof vi.fn<() => Promise<void>>>;
+  stop: ReturnType<typeof vi.fn<() => Promise<void>>>;
+};
+
 function createRpcClient(overrides?: {
   request?: (method: string) => Promise<unknown>;
   waitForClose?: () => Promise<void>;
-}) {
-  return {
+}): MockIMessageRpcClient {
+  const client = {
     request: vi.fn(
       overrides?.request ??
         (async () => {
@@ -50,6 +56,7 @@ function createRpcClient(overrides?: {
     ),
     stop: vi.fn(async () => {}),
   };
+  return client as unknown as MockIMessageRpcClient;
 }
 
 describe("monitorIMessageProvider watch.subscribe startup retry", () => {