@zhin.js/adapter-icqq 6.0.3 → 7.0.1

package/src/endpoint.ts

@@ -1,7 +1,7 @@
 /**
  * IcqqIpcEndpoint — lifecycle, outbound, IPC subscribe/admit for ICQQ daemon.
  */
-import type { EndpointInstance } from '@zhin.js/adapter';
+import type { EndpointInstance, EndpointManagement } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
@@ -19,6 +19,14 @@ import {
   type IcqqIpcMessageEvent,
 } from './icqq-inbound.js';
 import {
+  buildIcqqInboxNoticeRow,
+  buildIcqqInboxRequestRow,
+  buildIcqqSystemRequestRow,
+  isIcqqNoticePayload,
+  isIcqqRequestPayload,
+} from './icqq-inbox.js';
+import {
+  IcqqGuildCatalog,
   isIcqqGuildIpcEvent,
   normalizeIcqqGuildInboundMessage,
 } from './icqq-guild.js';
@@ -38,7 +46,7 @@ import {
   type IpcResponse,
   type ResolvedIcqqConfig,
 } from './protocol.js';
-import type { IpcFriendInfo, IpcGroupInfo } from './types.js';
+import type { IpcFriendInfo, IpcGroupInfo, IpcMemberInfo, IpcSystemMessage } from './types.js';
 
 const logger = getLogger('icqq');
 
@@ -56,11 +64,23 @@ export interface IcqqIpcTransport {
 
 export type CreateIcqqIpc = (config: ResolvedIcqqConfig) => Promise<IcqqIpcTransport>;
 
+/**
+ * 收件箱写/推钩子（由装配层注入，见 adapters/icqq.ts）。
+ * record* 写 unified_inbox_request/notice；publish 向 console hub 推送实时事件。
+ */
+export interface IcqqInboxHooks {
+  recordRequest(row: Record<string, unknown>): void | Promise<void>;
+  recordNotice(row: Record<string, unknown>): void | Promise<void>;
+  publish?(type: string, data: unknown): void;
+}
+
 export interface IcqqEndpointOptions {
   readonly id: CapabilityId;
   readonly gateway: MessageGateway;
   readonly config: ResolvedIcqqConfig;
   readonly createIpc?: CreateIcqqIpc;
+  /** 未注入时 request/notice 事件仅按非消息载荷忽略（不报错）。 */
+  readonly inbox?: IcqqInboxHooks;
 }
 
 export class IcqqIpcEndpoint implements EndpointInstance {
@@ -71,10 +91,28 @@ export class IcqqIpcEndpoint implements EndpointInstance {
   ipc!: IcqqIpcTransport;
   readonly friends = new Map<number, IpcFriendInfo>();
   readonly groups = new Map<number, IpcGroupInfo>();
+  readonly #guildCatalog = new IcqqGuildCatalog();
+  readonly management: EndpointManagement = Object.freeze<EndpointManagement>({
+    listFriends: () => this.getFriendList(),
+    listGroups: () => this.getGroupList(),
+    listChannels: async () => {
+      await this.#guildCatalog.syncAll(this.ipc);
+      return this.#guildCatalog.getGuildChannelList();
+    },
+    listGroupMembers: (groupId) => this.getGroupMemberList(groupId),
+    approveRequest: (requestId, remark) => this.approveRequest(requestId, remark),
+    rejectRequest: (requestId, reason) => this.rejectRequest(requestId, reason),
+    kickGroupMember: (groupId, userId) => this.removeMember(groupId, userId),
+    muteGroupMember: (groupId, userId, duration) => this.muteMember(groupId, userId, duration),
+    setGroupAdmin: (groupId, userId, enabled) => this.setModerator(groupId, userId, enabled),
+    deleteFriend: (userId) => this.deleteFriend(userId),
+  });
   #open = false;
   #started = false;
   #subscriptions: Array<{ unsubscribe: () => Promise<void> }> = [];
   #inboundDeduper = new InboundMessageDeduper();
+  /** request/notice 去重（推送事件与 GET_SYSTEM_MSG 首拉可能重复同一 flag）。 */
+  #inboxDeduper = new InboundMessageDeduper();
   #unregisterAgent?: () => void;
   /** 用户主动 stop 时为 true，阻止自动重连 */
   #intentionalDisconnect = false;
@@ -130,6 +168,9 @@ export class IcqqIpcEndpoint implements EndpointInstance {
       this.#handleEvent(event);
     });
     this.#subscriptions.push(sub);
+    // daemon 推送 client.em 全部事件，request/notice 实时到达；
+    // 启动时补一次 GET_SYSTEM_MSG，捞离线期间积存的待处理请求。
+    void this.#pullPendingSystemMessages();
   }
 
   /** IPC/RPC 意外断开时调度重连（指数退避） */
@@ -203,8 +244,10 @@ export class IcqqIpcEndpoint implements EndpointInstance {
     this.#unregisterAgent?.();
     this.#unregisterAgent = undefined;
     this.#inboundDeduper.clear();
+    this.#inboxDeduper.clear();
     this.friends.clear();
     this.groups.clear();
+    this.#guildCatalog.clear();
     try {
       this.ipc?.close();
     } catch {
@@ -404,15 +447,215 @@ export class IcqqIpcEndpoint implements EndpointInstance {
     }
   }
 
+  // ── 社交/群管（Console endpoint RPC 探测面）────────────────────────
+  // console-rpc-extended.ts 按方法名探测这些接口；全部薄封装走 IPC daemon。
+
+  /** EndpointManagement.listFriends —— 好友列表（LIST_FRIENDS，归一为 {user_id, nickname, remark}）。 */
+  async getFriendList(): Promise<Array<{ user_id: number; nickname: string; remark: string }>> {
+    const resp = await this.#mustRequest(Actions.LIST_FRIENDS, undefined, '获取好友列表');
+    const list = Array.isArray(resp.data) ? (resp.data as IpcFriendInfo[]) : [];
+    return list.map((f) => ({
+      user_id: f.user_id,
+      nickname: f.nickname,
+      remark: f.remark ?? '',
+    }));
+  }
+
+  /** EndpointManagement.listGroups —— 群列表（LIST_GROUPS，归一为 {group_id, name}）。 */
+  async getGroupList(): Promise<Array<{ group_id: number; name: string }>> {
+    const resp = await this.#mustRequest(Actions.LIST_GROUPS, undefined, '获取群列表');
+    const list = Array.isArray(resp.data) ? (resp.data as IpcGroupInfo[]) : [];
+    return list.map((g) => ({
+      group_id: g.group_id,
+      name: g.group_name,
+    }));
+  }
+
+  /** EndpointManagement.listGroupMembers —— 群成员列表（字段对齐 daemon 返回）。 */
+  async getGroupMemberList(groupId: number | string): Promise<IpcMemberInfo[]> {
+    const resp = await this.#mustRequest(
+      Actions.LIST_GROUP_MEMBERS,
+      { group_id: toNumericId(groupId, 'group_id') },
+      '获取群成员列表',
+    );
+    return Array.isArray(resp.data) ? (resp.data as IpcMemberInfo[]) : [];
+  }
+
+  /** getGroupMemberList 别名（console 探测 listMembers / getMemberList）。 */
+  listMembers(groupId: number | string): Promise<IpcMemberInfo[]> {
+    return this.getGroupMemberList(groupId);
+  }
+
+  getMemberList(groupId: number | string): Promise<IpcMemberInfo[]> {
+    return this.getGroupMemberList(groupId);
+  }
+
+  /**
+   * EndpointManagement.resolveRequest —— id 为 inbox 行的 platform_request_id。
+   * 先 GET_SYSTEM_MSG 按 flag（回退 seq）定位请求，再按类型路由 handle_friend/group_request。
+   */
+  async approveRequest(id: string, remark?: string): Promise<void> {
+    await this.#handleSystemRequest(id, true, { remark });
+  }
+
+  async rejectRequest(id: string, reason?: string): Promise<void> {
+    await this.#handleSystemRequest(id, false, { reason });
+  }
+
+  /** EndpointManagement.deleteFriend —— FRIEND_DELETE。 */
+  async deleteFriend(userId: number | string): Promise<void> {
+    await this.#mustRequest(
+      Actions.FRIEND_DELETE,
+      { user_id: toNumericId(userId, 'user_id') },
+      '删除好友',
+    );
+  }
+
+  /** deleteFriend 别名（console 探测 delete_friend）。 */
+  delete_friend(userId: number | string): Promise<void> {
+    return this.deleteFriend(userId);
+  }
+
+  /** EndpointManagement.kickGroupMember —— GROUP_KICK。 */
+  async removeMember(groupId: number | string, userId: number | string): Promise<void> {
+    await this.#mustRequest(
+      Actions.GROUP_KICK,
+      { group_id: toNumericId(groupId, 'group_id'), user_id: toNumericId(userId, 'user_id') },
+      '踢出群成员',
+    );
+  }
+
+  kickMember(groupId: number | string, userId: number | string): Promise<void> {
+    return this.removeMember(groupId, userId);
+  }
+
+  setGroupKick(groupId: number | string, userId: number | string): Promise<void> {
+    return this.removeMember(groupId, userId);
+  }
+
+  /** EndpointManagement.muteGroupMember —— GROUP_MUTE（duration 秒，默认 600）。 */
+  async muteMember(groupId: number | string, userId: number | string, duration = 600): Promise<void> {
+    await this.#mustRequest(
+      Actions.GROUP_MUTE,
+      {
+        group_id: toNumericId(groupId, 'group_id'),
+        user_id: toNumericId(userId, 'user_id'),
+        duration,
+      },
+      '禁言群成员',
+    );
+  }
+
+  banMember(groupId: number | string, userId: number | string, duration = 600): Promise<void> {
+    return this.muteMember(groupId, userId, duration);
+  }
+
+  setGroupMute(groupId: number | string, userId: number | string, duration = 600): Promise<void> {
+    return this.muteMember(groupId, userId, duration);
+  }
+
+  /** EndpointManagement.setGroupAdmin —— SET_GROUP_ADMIN（enable 默认 true）。 */
+  async setModerator(groupId: number | string, userId: number | string, enable = true): Promise<void> {
+    await this.#mustRequest(
+      Actions.SET_GROUP_ADMIN,
+      {
+        group_id: toNumericId(groupId, 'group_id'),
+        user_id: toNumericId(userId, 'user_id'),
+        enable,
+      },
+      '设置群管理员',
+    );
+  }
+
+  setAdmin(groupId: number | string, userId: number | string, enable = true): Promise<void> {
+    return this.setModerator(groupId, userId, enable);
+  }
+
+  setGroupAdmin(groupId: number | string, userId: number | string, enable = true): Promise<void> {
+    return this.setModerator(groupId, userId, enable);
+  }
+
+  /** IPC 请求并统一错误上下文：daemon 返回 ok=false 时抛出带操作名的错误。 */
+  async #mustRequest(
+    action: string,
+    params: Record<string, unknown> | undefined,
+    label: string,
+  ): Promise<IpcResponse> {
+    const resp = await this.request(action, params);
+    if (!resp.ok) {
+      throw new Error(`icqq ${label}失败: ${resp.error ?? 'daemon 未返回错误详情'}`);
+    }
+    return resp;
+  }
+
+  /** 按 flag/seq 在 GET_SYSTEM_MSG 中定位请求，路由到好友/群请求处理 action。 */
+  async #handleSystemRequest(
+    id: string,
+    approve: boolean,
+    extra: { remark?: string; reason?: string },
+  ): Promise<void> {
+    const resp = await this.#mustRequest(Actions.GET_SYSTEM_MSG, undefined, '获取待处理请求');
+    const data = resp.data as
+      | { friendRequests?: unknown; groupRequests?: unknown }
+      | undefined;
+    const friendRequests = Array.isArray(data?.friendRequests)
+      ? (data.friendRequests as IpcSystemMessage[])
+      : [];
+    const groupRequests = Array.isArray(data?.groupRequests)
+      ? (data.groupRequests as IpcSystemMessage[])
+      : [];
+    const matches = (m: IpcSystemMessage): boolean =>
+      m.flag === id || (m.seq != null && String(m.seq) === id);
+    const friend = friendRequests.find(matches);
+    const group = friend ? undefined : groupRequests.find(matches);
+    const target = friend ?? group;
+    if (!target?.flag) {
+      throw new Error(`icqq 未找到待处理请求: ${id}（GET_SYSTEM_MSG 中无匹配 flag/seq）`);
+    }
+    const params: Record<string, unknown> = { flag: target.flag, approve };
+    if (friend) {
+      if (extra.remark) params.remark = extra.remark;
+      await this.#mustRequest(Actions.HANDLE_FRIEND_REQUEST, params, '处理好友请求');
+    } else {
+      if (extra.reason) params.reason = extra.reason;
+      await this.#mustRequest(Actions.HANDLE_GROUP_REQUEST, params, '处理群请求');
+    }
+  }
+
   /** Test / internal: admit when open. */
   admit(msg: IcqqInboundMessage): void {
-    if (!this.#open) return;
-    // 新 Runtime Message.content 为纯文本：@ 本机（uin = name）只能经 metadata 传递
-    const mentioned = isIcqqBotMentioned({ uin: this.name, rawMessage: msg.content });
+    if (!this.#open) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'endpoint_closed',
+        endpoint: this.name,
+        id: msg.id,
+        target: msg.target,
+      }));
+      return;
+    }
+    // 新 Runtime Message.content 为纯文本：@ 本机（uin = name）经结构化段 / metadata 传递
+    const mentioned = isIcqqBotMentioned({
+      uin: this.name,
+      content: msg.segments,
+      rawMessage: msg.content,
+    });
+    logger.debug(formatCompact({
+      op: 'icqq_inbound_admit',
+      endpoint: this.name,
+      id: msg.id,
+      target: msg.target,
+      sender: msg.sender,
+      channelType: msg.channelType,
+      mentioned: mentioned || undefined,
+      preview: msg.content.slice(0, 80),
+      segments: summarizeSegmentTypes(msg.segments),
+    }));
     void this.#options.gateway.receive({
       adapter: this.#options.id,
       target: msg.target,
       content: msg.content,
+      ...(msg.segments ? { segments: msg.segments } : {}),
       sender: msg.sender,
       id: msg.id,
       metadata: Object.freeze({
@@ -456,12 +699,46 @@ export class IcqqIpcEndpoint implements EndpointInstance {
     }
     const payload = unwrapIcqqIpcEventPayload(event);
     if (!payload || typeof payload !== 'object') return;
+    if (isIcqqRequestPayload(payload)) {
+      this.#recordInboxRequest(payload as Record<string, unknown>);
+      return;
+    }
+    if (isIcqqNoticePayload(payload)) {
+      this.#recordInboxNotice(payload as Record<string, unknown>);
+      return;
+    }
     if (!isIcqqMessagePostType(payload)) return;
     const data = payload as IcqqIpcMessageEvent;
-    if (shouldSkipSelfInboundMessage(data)) return;
+    if (shouldSkipSelfInboundMessage(data)) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'self',
+        endpoint: this.name,
+        user_id: data.user_id,
+        self_id: data.self_id,
+      }));
+      return;
+    }
     const normalized = normalizeIcqqInboundMessage(data);
-    if (!normalized) return;
-    if (!this.#inboundDeduper.shouldProcess(normalized.messageId)) return;
+    if (!normalized) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'normalize_failed',
+        endpoint: this.name,
+        message_id: data.message_id,
+        message_type: data.message_type ?? data.type,
+      }));
+      return;
+    }
+    if (!this.#inboundDeduper.shouldProcess(normalized.messageId)) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'dedupe',
+        endpoint: this.name,
+        id: normalized.messageId,
+      }));
+      return;
+    }
     this.admit({
       id: normalized.messageId,
       target: formatInboundTarget({
@@ -470,6 +747,7 @@ export class IcqqIpcEndpoint implements EndpointInstance {
         channelParentGroupId: normalized.channelParentGroupId,
       }),
       content: formatInboundContent(normalized.rawMessage),
+      segments: normalized.content,
       sender: normalized.userId,
       channelType: normalized.channelType,
       metadata: buildIcqqQuoteMetadata(data, {
@@ -485,8 +763,24 @@ export class IcqqIpcEndpoint implements EndpointInstance {
     const normalized = normalizeIcqqGuildInboundMessage(
       payload as Parameters<typeof normalizeIcqqGuildInboundMessage>[0],
     );
-    if (!normalized) return;
-    if (!this.#inboundDeduper.shouldProcess(`guild:${normalized.messageId}`)) return;
+    if (!normalized) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'guild_normalize_failed',
+        endpoint: this.name,
+      }));
+      return;
+    }
+    this.#guildCatalog.upsertFromInbound(normalized.raw);
+    if (!this.#inboundDeduper.shouldProcess(`guild:${normalized.messageId}`)) {
+      logger.debug(formatCompact({
+        op: 'icqq_inbound_skip',
+        reason: 'dedupe',
+        endpoint: this.name,
+        id: `guild:${normalized.messageId}`,
+      }));
+      return;
+    }
     this.admit({
       id: normalized.messageId,
       target: formatInboundTarget({
@@ -495,6 +789,7 @@ export class IcqqIpcEndpoint implements EndpointInstance {
         guildId: normalized.guildId,
       }),
       content: formatInboundContent(normalized.rawMessage),
+      segments: normalized.content,
       sender: normalized.userId,
       channelType: 'channel',
       metadata: {
@@ -503,6 +798,68 @@ export class IcqqIpcEndpoint implements EndpointInstance {
       },
     });
   }
+
+  /** 收件箱行公共前缀：adapter 槽 localName + endpoint live 名（uin）。 */
+  #inboxBase(): { adapter: string; endpointId: string } {
+    const id = String(this.#options.id);
+    return { adapter: id.split('\0').pop() ?? id, endpointId: this.name };
+  }
+
+  #recordInboxRequest(payload: Record<string, unknown>): void {
+    const hooks = this.#options.inbox;
+    if (!hooks) return;
+    const row = buildIcqqInboxRequestRow(payload, this.#inboxBase());
+    if (!row) return;
+    if (!this.#inboxDeduper.shouldProcess(`request:${String(row.platform_request_id)}`)) return;
+    void hooks.recordRequest(row);
+    hooks.publish?.('endpoint:request', row);
+  }
+
+  #recordInboxNotice(payload: Record<string, unknown>): void {
+    const hooks = this.#options.inbox;
+    if (!hooks) return;
+    const row = buildIcqqInboxNoticeRow(payload, this.#inboxBase());
+    if (!row) return;
+    if (!this.#inboxDeduper.shouldProcess(`notice:${String(row.platform_notice_id)}`)) return;
+    void hooks.recordNotice(row);
+    hooks.publish?.('endpoint:notice', row);
+  }
+
+  /** 启动/重连后首拉 GET_SYSTEM_MSG：补录离线期间的好友/群待处理请求。 */
+  async #pullPendingSystemMessages(): Promise<void> {
+    const hooks = this.#options.inbox;
+    if (!hooks || !this.ipc) return;
+    try {
+      const resp = await this.ipc.request(Actions.GET_SYSTEM_MSG);
+      if (!resp.ok) return;
+      const data = resp.data as
+        | { friendRequests?: unknown; groupRequests?: unknown }
+        | undefined;
+      const base = this.#inboxBase();
+      const rows = [
+        ...(Array.isArray(data?.friendRequests)
+          ? (data.friendRequests as IpcSystemMessage[]).map((m) =>
+            buildIcqqSystemRequestRow(m, 'friend', base))
+          : []),
+        ...(Array.isArray(data?.groupRequests)
+          ? (data.groupRequests as IpcSystemMessage[]).map((m) =>
+            buildIcqqSystemRequestRow(m, 'group', base))
+          : []),
+      ];
+      for (const row of rows) {
+        if (!row) continue;
+        if (!this.#inboxDeduper.shouldProcess(`request:${String(row.platform_request_id)}`)) continue;
+        void hooks.recordRequest(row);
+        hooks.publish?.('endpoint:request', row);
+      }
+    } catch (error) {
+      logger.debug(formatCompact({
+        op: 'inbox_pull_system_msg',
+        endpoint: this.name,
+        error: error instanceof Error ? error.message : String(error),
+      }));
+    }
+  }
 }
 
 /**
@@ -536,6 +893,30 @@ function buildIcqqQuoteMetadata(
   return metadata;
 }
 
+/** console RPC 传入的 gid/uid 可能是字符串，统一收敛为数字。 */
+function toNumericId(value: number | string, label: string): number {
+  const n = Number(value);
+  if (!Number.isFinite(n) || String(value).trim() === '') {
+    throw new TypeError(`icqq ${label} 必须是数字: ${String(value)}`);
+  }
+  return n;
+}
+
+function summarizeSegmentTypes(
+  segments: readonly { readonly type?: unknown }[] | undefined,
+): string | undefined {
+  if (!segments?.length) return undefined;
+  return segments
+    .map((segment) => {
+      if (typeof segment.type === 'string') return segment.type;
+      if (segment.type && typeof segment.type === 'object' && 'name' in segment.type) {
+        return String((segment.type as { name: unknown }).name);
+      }
+      return '?';
+    })
+    .join(',');
+}
+
 async function defaultCreateIpc(config: ResolvedIcqqConfig): Promise<IcqqIpcTransport> {
   const uin = Number(config.name);
   if (config.rpc) {

package/src/icqq-endpoint-commands.ts

@@ -0,0 +1,37 @@
+/**
+ * `icqq endpoint` 命令族：由 @zhin.js/adapter 的 createEndpointCommands 套件生成。
+ *
+ * ICQQ 的凭据由外部守护进程（@icqqjs/cli）按账号持有（~/.icqq/<uin>/），
+ * 其 IPC/RPC 协议是「按 uin 连接 + auth + 账号级 action」，没有 add-account /
+ * 触发 login 的 action——扫码登录只能经 `icqq login <uin>` CLI 完成。
+ * 因此 add 不走 kv 凭据录入，而是 bindFlow：校验 uin、把 { name: '<uin>' }
+ * 追加到 plugins.icqq.endpoints，并引导用户先完成守护进程登录。
+ */
+import { addEndpointToConfig, createEndpointCommands } from '@zhin.js/adapter';
+import { defineCommand } from '@zhin.js/command';
+import { icqqRuntimeStateToken } from './icqq-runtime-state.js';
+
+export const icqqEndpointCommands = createEndpointCommands({
+  adapterKey: 'icqq',
+  adapterDisplayName: 'ICQQ',
+  running: (use) => use(icqqRuntimeStateToken).endpoints.values(),
+  describeEntry: (entry) => (entry.rpc ? 'rpc（远程守护进程）' : 'ipc（本地守护进程）'),
+  addDescription: '登记 ICQQ endpoint（uin 需先经 icqq login 完成扫码登录；重启 zhin 生效）',
+  bindFlow: ({ name }) => {
+    if (!name) {
+      return '用法：icqq endpoint add <uin>（uin 为纯数字 QQ 号，且需先执行 icqq login <uin> 完成扫码登录）';
+    }
+    if (!/^\d+$/.test(name)) {
+      return 'icqq endpoint 名必须是纯数字 QQ 号（uin）';
+    }
+    try {
+      const filePath = addEndpointToConfig('icqq', { name });
+      return (
+        `✅ endpoint「${name}」已追加到 ${filePath} 的 plugins.icqq.endpoints。\n` +
+        `⚠️ 请确保已执行 icqq login ${name} 启动守护进程并完成扫码登录；重启 zhin 后生效。`
+      );
+    } catch (error) {
+      return `添加失败：${error instanceof Error ? error.message : String(error)}`;
+    }
+  },
+}, defineCommand);

package/src/icqq-guild.ts

@@ -3,9 +3,16 @@
  */
 import { toCanonicalSegments, type MessageSegment } from "zhin.js";
 import { Actions, type IpcGuildMessageEventData } from "./protocol.js";
-import type { IpcClient } from "./ipc-client.js";
 import { parseCqMessage } from "./cq-message.js";
 
+/** Narrow request port shared by the real IPC client and endpoint test transports. */
+export interface IcqqGuildRpc {
+  request(
+    action: string,
+    params?: Record<string, unknown>,
+  ): Promise<{ ok: boolean; data?: unknown }>;
+}
+
 export interface IcqqGuildChannelEntry {
   channel_id: string;
   channel_name: string;
@@ -36,7 +43,7 @@ export class IcqqGuildCatalog {
     this.guilds.clear();
   }
 
-  async syncAll(ipc: IpcClient): Promise<void> {
+  async syncAll(ipc: IcqqGuildRpc): Promise<void> {
     const listResp = await ipc.request(Actions.GUILD_LIST);
     if (!listResp.ok) return;