@zhin.js/adapter-icqq 8.0.13 → 9.0.0

package/CHANGELOG.md

@@ -1,5 +1,63 @@
 # @zhin.js/adapter-icqq
 
+## 9.0.0
+
+### Patch Changes
+
+- Updated dependencies [f2c532f]
+- Updated dependencies [3dbf990]
+  - @zhin.js/adapter@1.2.0
+  - @zhin.js/core@1.5.13
+  - @zhin.js/agent@1.1.15
+  - zhin.js@6.0.13
+
+## 8.0.14
+
+### Patch Changes
+
+- 5969c5b: Remove legacy compound-string message targets and Endpoint control probing. Endpoint control and outbound Host operations now carry structured `MessageRef` identities. Endpoint send has one exact result contract (a platform message id), which IM Runtime projects into `DeliveryReceipt.message`; arbitrary result guessing is removed.
+- 5969c5b: Drop ICQQ unified_inbox dual-write for request/notice; Console request.list prefers EndpointManagement.listRequests, and approval stays on $approve / management.
+- 5969c5b: Wire ICQQ login challenges (QR / slider / SMS / auth) through LoginAssist so pending tasks survive Console refresh; add login.list/submit/cancel RPC and TTY stdin consumer.
+- 7cd8b34: Send canonical outbound segments as native ICQQ `Sendable` elements instead of literal CQ-like text. Resolve inbound voice and video URLs while the endpoint client is active, preserve file metadata and opaque platform references, and reject unsupported mixed standalone media messages instead of silently dropping segments.
+- 5969c5b: Add SideEventGateway so adapters forward notice/request/system into HandlerIndex. HandlerContext now exposes only generation-safe capabilities and prompt ports; live Endpoint escape hatches are removed.
+- 2f786bd: Replace text-only IM context and metadata-based quote handling with canonical
+  conversation events, scoped reference resolution, explicit Endpoint content
+  ports, and typed multimedia outcomes. Conversation notices are projected as
+  untrusted context data rather than model-authority system instructions.
+  The process-global passive-group buffer is removed: prior inbound conversation messages
+  are now consumed from the same event store and cursor, with the current Turn
+  message excluded from its own context projection.
+  The unused `ConversationMemory` topic-memory runtime, its timers, legacy tables,
+  and topic-window configuration are removed; `ContextRepository` is the only
+  Agent conversation-history authority.
+- Updated dependencies [5969c5b]
+- Updated dependencies [d336a3f]
+- Updated dependencies [0c82a7e]
+- Updated dependencies [b9217e4]
+- Updated dependencies [5969c5b]
+- Updated dependencies [5969c5b]
+- Updated dependencies [974772e]
+- Updated dependencies [5969c5b]
+- Updated dependencies [5969c5b]
+- Updated dependencies [2f786bd]
+- Updated dependencies [63d89f9]
+- Updated dependencies [71c7cdd]
+- Updated dependencies [3cca0ea]
+- Updated dependencies [1312ca0]
+- Updated dependencies [985fa22]
+- Updated dependencies [04b861d]
+- Updated dependencies [a23d544]
+- Updated dependencies [8cddabf]
+- Updated dependencies [dbe5081]
+  - @zhin.js/im-contract@1.0.4
+  - @zhin.js/core@1.5.12
+  - @zhin.js/adapter@1.1.11
+  - @zhin.js/agent@1.1.14
+  - @zhin.js/command@1.0.15
+  - zhin.js@6.0.12
+  - @zhin.js/permission@1.0.3
+  - @zhin.js/tool@1.0.12
+
 ## 8.0.13
 
 ### Patch Changes

package/README.md

@@ -5,8 +5,8 @@ ICQQ Plugin Runtime 适配器 — 进程内直接使用 [@icqqjs/icqq](https://g
 ## 功能特性
 
 - 群聊 / 私聊 / 群临时会话 / QQ 频道消息
-- 入站：`messageGatewayToken`，归一为 `gateway.receive({ conversation, message, content, ... })`
-- 出站：`send({ conversation, payload })` → `sendGroupMsg` / `sendPrivateMsg` / …（conversation kind/id/parent 路由）
+- 入站：`messageGatewayToken`，文本与图片 / 语音 / 视频 / 文件统一归一为 canonical `Segment` + `MediaRef`
+- 出站：canonical Segment 直接投影为 ICQQ 原生 `Sendable`，再由 `sendGroupMsg` / `sendPrivateMsg` / …发送
 - 群聊 reaction：`control.addReaction` / `removeReaction`（协议 ACK 失败不阻塞后续发送）
 - Agent 工具：包根 `tools/`（`@zhin.js/tool` Feature；模型侧名为 `icqq__send_user_like` 等）
 - Console Endpoint 管理：`src/endpoint.ts` 显式实现 `EndpointManagement`（好友/群/群成员列表、请求审批、删好友、踢人、禁言、设管理）
@@ -76,9 +76,13 @@ plugins:
 
 - 不再经过 `@icqqjs/cli` IPC 守护进程；登录态与协议栈都在本进程。
 - `autoReconnect`：Client 断线后按配置自动重连（`stop()` 为主动断开，不触发重连）。
-- `outboundMedia: file | base64`：`file` 把 segment base64 落盘后发本地路径；`base64` 发 CQ `base64://` 内联。
+- `outboundMedia: file | base64`：`file` 在发送期间把 segment base64 物化为临时文件并于发送结束清理；`base64` 使用 ICQQ 原生支持的 `base64://` file 参数。
+- ICQQ 的语音、视频、文件是独立消息元素；它们与其他段混发时适配器会明确拒绝，避免协议栈静默丢段。
+- 入站语音 / 视频在 Endpoint 持有原生 Client 时解析可下载 URL；解析失败则保留真实平台引用，不伪造或丢弃媒体。
 - **Console 社交/群管 RPC 已接线**：endpoint 把好友/群/群成员列表、请求审批和群管操作归一化为冻结的 `EndpointManagement`。Host 只消费该语义端口。
-- 好友/入群请求与通知写入 unified inbox（有 DatabaseHost 时），不再走已删除的 `notice.receive` / `request.receive` 事件。
+- 好友/入群请求与通知：经 `sideEventGatewayToken` 分发到 `handlers`（`notice.receive` / `request.receive`）；审批走 `Request.$approve` / `EndpointManagement.approveRequest`。Console `request.list` 优先读 `management.listRequests()`（`getSystemMsg`），不再写入 `unified_inbox_request/notice`。
+- `system.*`（登录扫码等）分发到 `system.receive`。
+- **登录辅助**：`system.login.qrcode|slider|device|auth` 经 `loginAssistToken`（`LoginAssist`）挂起待办；刷新后可用 Console `login.list` / `login.submit` 或终端 stdin 继续（对齐 icqq 官方 stdin 流程）。`system.online` / `login.error` 会清理该 endpoint 待办。
 
 ## License
 

package/adapters/icqq.js

@@ -3,14 +3,11 @@
  * Convention entry: discover `adapters/icqq.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { messageGatewayToken } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
-import { databaseHostToken, INBOX_TABLE_NOTICE, INBOX_TABLE_REQUEST, runtimeEventPublisherToken, } from 'zhin.js';
+import { loginAssistToken, messageGatewayToken, sideEventGatewayToken, } from '@zhin.js/core/runtime';
 import { IcqqEndpoint } from "../lib/endpoint.js";
 import { icqqRuntimeStateToken } from "../lib/icqq-runtime-state.js";
 import { resolveIcqqConfig, } from "../lib/protocol.js";
 export { IcqqEndpoint } from "../lib/endpoint.js";
-const logger = getLogger('icqq');
 export default defineAdapter({
     capabilities: ['inbound', 'outbound'],
     operations: ['recall', 'reaction'],
@@ -25,61 +22,12 @@ export default defineAdapter({
             id: config.id,
             mode: 'direct',
         });
-        const inbox = resolveInboxHooks(context);
         return new IcqqEndpoint({
             id: context.id,
             gateway: context.use(messageGatewayToken),
+            sideEvents: context.use(sideEventGatewayToken),
+            loginAssist: context.use(loginAssistToken),
             config,
-            ...(inbox ? { inbox } : {}),
         });
     },
 });
-/** 资源可选（轻量 Root 无 DatabaseHost / console hub）：缺失时降级为不写收件箱。 */
-function tryUse(context, token) {
-    try {
-        return context.use(token);
-    }
-    catch {
-        return undefined;
-    }
-}
-/**
- * 收件箱钩子：写 unified_inbox_request/notice（按 platform_*_id 去重，
- * 推送事件与 GET_SYSTEM_MSG 首拉可能重复同一请求），并经 console hub 广播。
- */
-function resolveInboxHooks(context) {
-    const host = tryUse(context, databaseHostToken);
-    const publisher = tryUse(context, runtimeEventPublisherToken);
-    if (!host && !publisher)
-        return undefined;
-    const insertDeduped = async (table, idField, row) => {
-        const model = host?.models.get(table);
-        if (!model)
-            return;
-        try {
-            const existing = await model.select().where({
-                adapter: row.adapter,
-                endpoint_id: row.endpoint_id,
-                [idField]: row[idField],
-            });
-            if (Array.isArray(existing) && existing.length > 0)
-                return;
-            await model.insert(row);
-        }
-        catch (error) {
-            logger.warn(formatCompact({
-                op: 'inbox_insert',
-                table,
-                error: error instanceof Error ? error.message : String(error),
-            }));
-        }
-    };
-    const publish = publisher;
-    return {
-        recordRequest: (row) => insertDeduped(INBOX_TABLE_REQUEST, 'platform_request_id', row),
-        recordNotice: (row) => insertDeduped(INBOX_TABLE_NOTICE, 'platform_notice_id', row),
-        ...(publish
-            ? { publish: (type, data) => publish.publish(type, data) }
-            : {}),
-    };
-}

package/adapters/icqq.ts

@@ -2,16 +2,12 @@
  * Convention entry: discover `adapters/icqq.ts` → defineAdapter.
  */
 import { defineAdapter, type AdapterContext } from 'zhin.js/adapter';
-import { messageGatewayToken } from '@zhin.js/core/runtime';
-import { formatCompact, getLogger } from '@zhin.js/logger';
 import {
-  databaseHostToken,
-  INBOX_TABLE_NOTICE,
-  INBOX_TABLE_REQUEST,
-  runtimeEventPublisherToken,
-  type Token,
-} from 'zhin.js';
-import { IcqqEndpoint, type IcqqInboxHooks } from '../src/endpoint.js';
+  loginAssistToken,
+  messageGatewayToken,
+  sideEventGatewayToken,
+} from '@zhin.js/core/runtime';
+import { IcqqEndpoint } from '../src/endpoint.js';
 import { icqqRuntimeStateToken } from '../src/icqq-runtime-state.js';
 import {
   resolveIcqqConfig,
@@ -21,7 +17,11 @@ import {
 export { IcqqEndpoint } from '../src/endpoint.js';
 export type { IcqqEndpointOptions } from '../src/endpoint.js';
 
-const logger = getLogger('icqq');
+declare module '@zhin.js/core' {
+  interface AdapterEndpoints {
+    icqq: import('../src/endpoint.js').IcqqEndpoint;
+  }
+}
 
 export default defineAdapter<IcqqAdapterConfig>({
   capabilities: ['inbound', 'outbound'],
@@ -37,62 +37,12 @@ export default defineAdapter<IcqqAdapterConfig>({
       id: config.id,
       mode: 'direct',
     });
-    const inbox = resolveInboxHooks(context);
     return new IcqqEndpoint({
       id: context.id,
       gateway: context.use(messageGatewayToken),
+      sideEvents: context.use(sideEventGatewayToken),
+      loginAssist: context.use(loginAssistToken),
       config,
-      ...(inbox ? { inbox } : {}),
     });
   },
 });
-
-/** 资源可选（轻量 Root 无 DatabaseHost / console hub）：缺失时降级为不写收件箱。 */
-function tryUse<T>(context: AdapterContext<IcqqAdapterConfig>, token: Token<T>): T | undefined {
-  try {
-    return context.use(token);
-  } catch {
-    return undefined;
-  }
-}
-
-/**
- * 收件箱钩子：写 unified_inbox_request/notice（按 platform_*_id 去重，
- * 推送事件与 GET_SYSTEM_MSG 首拉可能重复同一请求），并经 console hub 广播。
- */
-function resolveInboxHooks(context: AdapterContext<IcqqAdapterConfig>): IcqqInboxHooks | undefined {
-  const host = tryUse(context, databaseHostToken);
-  const publisher = tryUse(context, runtimeEventPublisherToken);
-  if (!host && !publisher) return undefined;
-  const insertDeduped = async (
-    table: string,
-    idField: 'platform_request_id' | 'platform_notice_id',
-    row: Record<string, unknown>,
-  ): Promise<void> => {
-    const model = host?.models.get(table);
-    if (!model) return;
-    try {
-      const existing = await model.select().where({
-        adapter: row.adapter,
-        endpoint_id: row.endpoint_id,
-        [idField]: row[idField],
-      });
-      if (Array.isArray(existing) && existing.length > 0) return;
-      await model.insert(row);
-    } catch (error) {
-      logger.warn(formatCompact({
-        op: 'inbox_insert',
-        table,
-        error: error instanceof Error ? error.message : String(error),
-      }));
-    }
-  };
-  const publish = publisher;
-  return {
-    recordRequest: (row) => insertDeduped(INBOX_TABLE_REQUEST, 'platform_request_id', row),
-    recordNotice: (row) => insertDeduped(INBOX_TABLE_NOTICE, 'platform_notice_id', row),
-    ...(publish
-      ? { publish: (type: string, data: unknown): void => publish.publish(type, data) }
-      : {}),
-  };
-}

package/lib/cq-message.d.ts

@@ -1,22 +1,14 @@
-/**
- * CQ 码与 MessageSegment 互转。
- * 出站：@icqqjs/cli 要求 message 为非空字符串；引用段编码为 [reply:id]（需 cli parse-message 支持 reply，见 scripts/patch-icqq-cli-reply.mjs）。
- * 媒体段双向均为 canonical MediaRef（`data.media`），无 legacy url/file/base64 字段。
- */
+/** ICQQ 历史文本视图 → canonical MessageSegment。出站只使用原生 Sendable。 */
 import { type MediaRef } from "@zhin.js/core";
-import { MessageSegment, SendContent } from "zhin.js";
+import type { MessageSegment } from "zhin.js";
 /**
  * CQ 媒体参数 / 入站元素媒体值 → canonical MediaRef：
  * `base64://` → base64；http(s) → url；本机路径 → path；其余视为平台不透明引用（file）。
  */
 export declare function icqqMediaRefFromString(value: string): MediaRef;
 /**
- * canonical MediaRef（`data.media`，唯一媒体来源）→ CQ 媒体参数：
- * base64 → `base64://` 前缀（守护进程解码）；url/path/file 原样直出。
- * 无 canonical 媒体引用时 warn 并返回 undefined（调用方丢弃该段）。
+ * canonical MediaRef（`data.media`，唯一媒体来源）→ ICQQ native
+ * element 的 file 参数。base64 使用 ICQQ 原生支持的 `base64://` 前缀。
  */
-export declare function resolveCqMediaArg(type: string, data: Record<string, unknown> | undefined): string | undefined;
+export declare function resolveIcqqMediaFile(data: Record<string, unknown> | undefined): string | undefined;
 export declare function parseCqMessage(raw: string): MessageSegment[];
-/** 构建 icqq send_*_msg 的 message 字符串（非空） */
-export declare function buildIcqqMessage(content: SendContent): string;
-export declare function toCqString(content: SendContent): string;

package/lib/cq-message.js

@@ -1,12 +1,5 @@
-/**
- * CQ 码与 MessageSegment 互转。
- * 出站：@icqqjs/cli 要求 message 为非空字符串；引用段编码为 [reply:id]（需 cli parse-message 支持 reply，见 scripts/patch-icqq-cli-reply.mjs）。
- * 媒体段双向均为 canonical MediaRef（`data.media`），无 legacy url/file/base64 字段。
- */
+/** ICQQ 历史文本视图 → canonical MessageSegment。出站只使用原生 Sendable。 */
 import { isMediaRef } from "@zhin.js/core";
-import { formatCompact, getLogger } from "@zhin.js/logger";
-import { segment } from "zhin.js";
-const logger = getLogger("icqq");
 const MAX_CQ_PARSE_LEN = 256_000;
 /**
  * CQ 媒体参数 / 入站元素媒体值 → canonical MediaRef：
@@ -25,20 +18,13 @@ export function icqqMediaRefFromString(value) {
     return { kind: "file", value };
 }
 /**
- * canonical MediaRef（`data.media`，唯一媒体来源）→ CQ 媒体参数：
- * base64 → `base64://` 前缀（守护进程解码）；url/path/file 原样直出。
- * 无 canonical 媒体引用时 warn 并返回 undefined（调用方丢弃该段）。
+ * canonical MediaRef（`data.media`，唯一媒体来源）→ ICQQ native
+ * element 的 file 参数。base64 使用 ICQQ 原生支持的 `base64://` 前缀。
  */
-export function resolveCqMediaArg(type, data) {
+export function resolveIcqqMediaFile(data) {
     const media = data?.media;
-    if (!isMediaRef(media)) {
-        logger.warn(formatCompact({
-            op: "icqq_outbound_media_dropped",
-            type,
-            reason: "missing_media_ref",
-        }));
+    if (!isMediaRef(media))
         return undefined;
-    }
     if (media.kind === "base64") {
         return media.value.startsWith("base64://") ? media.value : `base64://${media.value}`;
     }
@@ -68,7 +54,7 @@ function pushCqSegment(segments, type, arg) {
             break;
         case "record":
         case "audio":
-            segments.push({ type: "record", data: { media: icqqMediaRefFromString(arg) } });
+            segments.push({ type: "audio", data: { media: icqqMediaRefFromString(arg) } });
             break;
         case "video":
             segments.push({ type: "video", data: { media: icqqMediaRefFromString(arg) } });
@@ -118,55 +104,3 @@ export function parseCqMessage(raw) {
     }
     return segments.length ? segments : [{ type: "text", data: { text: raw } }];
 }
-/** 构建 icqq send_*_msg 的 message 字符串（非空） */
-export function buildIcqqMessage(content) {
-    let message = toCqString(content).trim();
-    if (!message)
-        message = "\u200b";
-    return message;
-}
-export function toCqString(content) {
-    if (!Array.isArray(content))
-        content = [content];
-    return content
-        .map((seg) => {
-        if (typeof seg === "string")
-            return seg;
-        const { type, data } = seg;
-        switch (type) {
-            case "text":
-                return data.text ?? "";
-            case "face":
-                return `[face:${data.id}]`;
-            case "image": {
-                const arg = resolveCqMediaArg("image", data);
-                return arg ? `[image:${arg}]` : "";
-            }
-            case "at":
-            case "mention": {
-                const target = data.target ?? data.qq ?? data.id ?? data.user_id;
-                return `[at:${target}]`;
-            }
-            case "dice":
-                return "[dice]";
-            case "rps":
-                return "[rps]";
-            case "record":
-            case "audio": {
-                const arg = resolveCqMediaArg("record", data);
-                return arg ? `[record:${arg}]` : "";
-            }
-            case "video": {
-                const arg = resolveCqMediaArg("video", data);
-                return arg ? `[video:${arg}]` : "";
-            }
-            case "reply":
-                return `[reply:${data.message_id ?? data.id}]`;
-            case "json":
-                return `[json:${data.text ?? ''}]`;
-            default:
-                return segment.toString(seg);
-        }
-    })
-        .join("");
-}

package/lib/endpoint.d.ts

@@ -1,29 +1,28 @@
 import { Client } from '@icqqjs/icqq';
 import type { EndpointControl, EndpointInstance, EndpointManagement, EndpointSendRequest } from 'zhin.js/adapter';
-import type { MessageGateway } from '@zhin.js/core/runtime';
+import type { EndpointContentPort } from '@zhin.js/adapter';
+import type { MessageGateway, SideEventGateway } from '@zhin.js/core/runtime';
+import { type LoginAssist } from '@zhin.js/core';
 import type { CapabilityId } from 'zhin.js';
 import { type IcqqInboundMessage, type ResolvedIcqqConfig } from './protocol.js';
-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 inbox?: IcqqInboxHooks;
+    readonly sideEvents: SideEventGateway;
+    readonly loginAssist: LoginAssist;
 }
 export declare class IcqqEndpoint extends Client implements EndpointInstance {
     #private;
     readonly endpointName: string;
+    readonly content: EndpointContentPort;
     readonly management: EndpointManagement;
     readonly control: EndpointControl;
     constructor(options: IcqqEndpointOptions);
-    start(): Promise<void>;
+    start(signal: AbortSignal): Promise<void>;
     open(): void;
-    close(): void;
+    close(): Promise<void>;
     stop(): Promise<void>;
     send({ conversation, payload }: EndpointSendRequest): Promise<string>;
-    admit(msg: IcqqInboundMessage): void;
+    admit(msg: IcqqInboundMessage, admittedBeforeRetire?: boolean): void;
 }