@zhin.js/adapter-icqq 1.1.0 → 1.1.3

package/lib/protocol.d.ts

@@ -161,9 +161,9 @@ export declare const Actions: {
     readonly SET_NOTIFY: "set_notify";
     readonly GET_NOTIFY: "get_notify";
 };
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface IcqqAdapterConfig {
-    readonly id?: string;
+/** One expanded ICQQ endpoint configuration produced by AdapterIndex. */
+export interface IcqqEndpointConfig {
+    readonly id: string;
     readonly autoReconnect?: boolean;
     readonly outboundMedia?: 'file' | 'base64';
     readonly password?: string;
@@ -177,24 +177,6 @@ export interface IcqqAdapterConfig {
     readonly autoServer?: boolean;
     readonly qqnt?: boolean;
     readonly ntLogin?: boolean;
-    /** Transitional: legacy root `endpoints[]` with `context: icqq`. */
-    readonly endpoints?: ReadonlyArray<{
-        readonly context?: string;
-        readonly id?: string;
-        readonly autoReconnect?: boolean;
-        readonly outboundMedia?: 'file' | 'base64';
-        readonly password?: string;
-        readonly platform?: number;
-        readonly ver?: string;
-        readonly dataDir?: string;
-        readonly signApiAddr?: string;
-        readonly ignoreSelf?: boolean;
-        readonly resend?: boolean;
-        readonly cacheGroupMember?: boolean;
-        readonly autoServer?: boolean;
-        readonly qqnt?: boolean;
-        readonly ntLogin?: boolean;
-    }>;
 }
 export interface ResolvedIcqqConfig {
     readonly context: 'icqq';
@@ -251,7 +233,7 @@ export type ParsedIcqqSendTarget = {
     readonly guildId: string;
     readonly channelId: string;
 };
-export declare function resolveIcqqConfig(config?: IcqqAdapterConfig): ResolvedIcqqConfig;
+export declare function resolveIcqqConfig(config: IcqqEndpointConfig): ResolvedIcqqConfig;
 /**
  * 入站归一化 → ConversationRef：群临时会话（temp）映射为群容器内的 private
  * 会话（parent kind 'group'）；频道消息的所属 guild 进 `parent`（kind 'channel'）。

package/lib/protocol.js

@@ -1,4 +1,3 @@
-import { pickCredential } from 'zhin.js/adapter';
 import { resolveIcqqMediaFile } from "./cq-message.js";
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
 /**
@@ -172,25 +171,24 @@ export const Actions = {
     SET_NOTIFY: "set_notify",
     GET_NOTIFY: "get_notify",
 };
-export function resolveIcqqConfig(config = {}) {
-    const entry = config.endpoints?.find((item) => item.context === 'icqq');
-    const id = pickCredential(config.id, entry?.id, process.env.ICQQ_ACCOUNT);
+export function resolveIcqqConfig(config) {
+    const id = typeof config.id === 'string' ? config.id.trim() : '';
     if (!/^\d+$/.test(id)) {
-        throw new TypeError('ICQQ adapter requires numeric id (QQ uin) via plugins.<key>.id or ICQQ_ACCOUNT');
+        throw new TypeError('ICQQ endpoint requires a numeric id (QQ uin)');
     }
-    const autoReconnect = config.autoReconnect ?? entry?.autoReconnect ?? true;
-    const outboundMedia = config.outboundMedia ?? entry?.outboundMedia;
-    const password = config.password ?? entry?.password;
-    const platform = config.platform ?? entry?.platform ?? 2;
-    const ver = config.ver ?? entry?.ver ?? '9.1.70';
-    const dataDir = config.dataDir ?? entry?.dataDir ?? `data/icqq/${id}`;
-    const signApiAddr = config.signApiAddr ?? entry?.signApiAddr;
-    const ignoreSelf = config.ignoreSelf ?? entry?.ignoreSelf ?? true;
-    const resend = config.resend ?? entry?.resend;
-    const cacheGroupMember = config.cacheGroupMember ?? entry?.cacheGroupMember ?? true;
-    const autoServer = config.autoServer ?? entry?.autoServer ?? true;
-    const qqnt = config.qqnt ?? entry?.qqnt;
-    const ntLogin = config.ntLogin ?? entry?.ntLogin;
+    const autoReconnect = config.autoReconnect ?? true;
+    const outboundMedia = config.outboundMedia;
+    const password = config.password;
+    const platform = config.platform ?? 2;
+    const ver = config.ver ?? '9.1.70';
+    const dataDir = config.dataDir ?? `data/icqq/${id}`;
+    const signApiAddr = config.signApiAddr;
+    const ignoreSelf = config.ignoreSelf ?? true;
+    const resend = config.resend;
+    const cacheGroupMember = config.cacheGroupMember ?? true;
+    const autoServer = config.autoServer ?? true;
+    const qqnt = config.qqnt;
+    const ntLogin = config.ntLogin;
     return {
         context: 'icqq',
         id,
@@ -262,6 +260,7 @@ const ICQQ_STANDALONE_ELEMENTS = new Set([
     'video',
     'file',
     'json',
+    'share',
     'long_msg',
 ]);
 /**
@@ -356,7 +355,7 @@ export function formatOutboundBody(payload) {
                 return { type: 'long_msg', resid };
             }
             case 'share':
-                return formatMusicShareJson(item.data);
+                return formatShare(item.data);
             default: {
                 const text = item.data?.text;
                 if (typeof text === 'string' && text)
@@ -382,44 +381,42 @@ function isWireSegment(value) {
         && value !== null
         && typeof value.type === 'string';
 }
-function formatMusicShareJson(data) {
+function formatShare(data) {
     if (!data)
         throw new TypeError('ICQQ share segment requires data');
     const config = data.config;
-    const title = String(data.title ?? '');
-    const desc = String(data.artist ?? '');
-    const jumpUrl = String(data.url ?? '');
-    const musicUrl = String(data.audio ?? '');
-    const preview = String(data.image ?? '');
-    const tag = config?.appid === 100497308 ? 'QQ音乐'
-        : config?.appid === 100495085 ? '网易云音乐'
-            : config?.appid === 100243533 ? '酷我音乐'
-                : config?.appid === 205141 ? '酷狗音乐'
-                    : '音乐';
-    const json = {
-        app: 'com.tencent.structmsg',
-        view: 'music',
-        ver: '0.0.0.1',
-        desc: 'music',
-        prompt: `[分享]${title}`,
-        meta: {
-            music: {
-                action: '',
-                android_pkg_name: config?.package ?? '',
-                app_type: 1,
-                appid: config?.appid ?? 0,
-                ctime: 0,
-                desc,
-                jumpUrl,
-                musicUrl,
-                preview,
-                sourceMsgId: '0',
-                source_icon: config?.icon ?? '',
-                source_url: '',
-                tag,
-                title,
-            },
-        },
+    const title = String(data.title ?? '').trim();
+    const url = String(data.url ?? '').trim();
+    if (!title)
+        throw new TypeError('ICQQ share segment requires title');
+    if (!url)
+        throw new TypeError('ICQQ share segment requires url');
+    const optionalString = (value) => {
+        const text = String(value ?? '').trim();
+        return text || undefined;
+    };
+    const appid = Number(config?.appid);
+    const appname = optionalString(config?.package);
+    const appsign = optionalString(config?.sign);
+    const shareConfig = Number.isSafeInteger(appid) && appid > 0
+        ? {
+            appid,
+            ...(appname ? { appname } : {}),
+            ...(appsign ? { appsign } : {}),
+        }
+        : undefined;
+    const summary = optionalString(data.description) ?? optionalString(data.artist);
+    const content = optionalString(data.content);
+    const image = optionalString(data.image);
+    const audio = optionalString(data.audio);
+    return {
+        type: 'share',
+        title,
+        url,
+        ...(summary ? { summary } : {}),
+        ...(content ? { content } : {}),
+        ...(image ? { image } : {}),
+        ...(audio ? { audio } : {}),
+        ...(shareConfig ? { config: shareConfig } : {}),
     };
-    return { type: 'json', data: json };
 }

package/lib/types.d.ts

@@ -9,12 +9,6 @@ export interface IcqqSenderInfo {
     card?: string;
     title?: string;
 }
-export interface IcqqEndpointConfig {
-    context: "icqq";
-    name: `${number}`;
-    autoReconnect?: boolean;
-    outboundMedia?: "file" | "base64";
-}
 export interface FriendInfo {
     user_id: number;
     nickname: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,31 +34,29 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.12",
-    "@zhin.js/core": "1.1.35",
-    "@zhin.js/feature-kit": "1.1.0",
-    "@zhin.js/im-contract": "1.1.0",
-    "@zhin.js/logger": "1.1.0",
-    "@zhin.js/permission": "1.1.0",
-    "@zhin.js/tool": "1.1.0"
+    "@zhin.js/adapter": "1.1.15",
+    "@zhin.js/agent-feature": "1.1.2",
+    "@zhin.js/core": "1.1.38",
+    "@zhin.js/feature-kit": "1.1.2",
+    "@zhin.js/im-contract": "1.1.2",
+    "@zhin.js/logger": "1.1.1",
+    "@zhin.js/permission": "1.1.2",
+    "@zhin.js/skill": "1.1.2",
+    "@zhin.js/tool": "1.1.2"
   },
   "peerDependencies": {
     "@icqqjs/icqq": "^1.12.2",
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.12",
-    "@zhin.js/agent": "^1.1.23",
-    "@zhin.js/command": "^1.1.0",
-    "@zhin.js/core": "^1.1.35",
-    "@zhin.js/prompt-section": "^1.1.0",
-    "zhin.js": "^1.1.0"
+    "@zhin.js/adapter": "^1.1.15",
+    "@zhin.js/command": "^1.1.2",
+    "@zhin.js/core": "^1.1.38",
+    "@zhin.js/prompt-section": "^1.1.2",
+    "zhin.js": "^1.1.3"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
       "optional": true
     },
-    "@zhin.js/agent": {
-      "optional": true
-    },
     "@zhin.js/command": {
       "optional": true
     },
@@ -78,9 +76,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.23",
-    "@zhin.js/prompt-section": "1.1.0",
-    "zhin.js": "1.1.0"
+    "@zhin.js/prompt-section": "1.1.2",
+    "zhin.js": "1.1.3"
   },
   "files": [
     "adapters",
@@ -89,10 +86,11 @@
     "schema.json",
     "src",
     "lib",
-    "agent",
-    "tools",
+    "agents",
     "README.md",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "PERMITS.md",
+    "prompt-sections"
   ],
   "publishConfig": {
     "access": "public",
@@ -119,6 +117,14 @@
       {
         "package": "@zhin.js/tool",
         "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/skill",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/agent-feature",
+        "api": "^1.0.0"
       }
     ],
     "plugins": []

package/plugin.js

@@ -9,7 +9,7 @@ export default definePlugin({
         displayName: 'ICQQ Adapter',
     },
     setup(context) {
-        // 运行中 endpoint 注册表（icqq.endpoint list 的"运行中"数据源）
+        // 运行中 endpoint 注册表（icqq endpoint list 的"运行中"数据源）
         context.resources.provide(icqqRuntimeStateToken, createEndpointRuntimeState());
         const disposePlatform = context.resources.has(permissionHostToken)
             ? context.resources.use(permissionHostToken).registerPlatform('icqq', createSceneRolePlatformChecker())

package/prompt-sections/platform/index.js

@@ -0,0 +1,16 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { defineAgentPromptSection } from '@zhin.js/prompt-section';
+export default defineAgentPromptSection({
+    title: 'ICQQ / QQ',
+    content: [
+        'ICQQ capabilities are grouped into directory, interaction, group-admin, and group-state Skills.',
+        'Use discover for the user intent, then load only the matching Skill before calling its private Tool.',
+        'The current IM operation selects the bot Client automatically; never guess user_id or group_id.',
+    ].join('\n'),
+    layer: 'tools',
+    order: 70,
+    retention: 'preferred',
+    maxChars: 1200,
+    profiles: ['interactive'],
+    platforms: ['icqq'],
+});

package/{agent/prompt-sections/platform.ts → prompt-sections/platform/index.ts}

@@ -3,10 +3,9 @@ import { defineAgentPromptSection } from '@zhin.js/prompt-section';
 export default defineAgentPromptSection({
   title: 'ICQQ / QQ',
   content: [
-    'On icqq/QQ: if icqq__send_user_like is in your tool list, call it with { user_id, times }.',
-    'The current IM operation selects the bot Client automatically. user_id is the sender to like. times is 1-20.',
-    'Do not claim the tool is missing until calling it this turn or load_tool("icqq__send_user_like") fails.',
-    'Other social tools include icqq__poke and icqq__friend_list.',
+    'ICQQ capabilities are grouped into directory, interaction, group-admin, and group-state Skills.',
+    'Use discover for the user intent, then load only the matching Skill before calling its private Tool.',
+    'The current IM operation selects the bot Client automatically; never guess user_id or group_id.',
   ].join('\n'),
   layer: 'tools',
   order: 70,

package/schema.json

@@ -76,13 +76,15 @@
     },
     "endpoints": {
       "type": "array",
+      "minItems": 1,
       "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
-        "additionalProperties": true,
+        "additionalProperties": false,
         "properties": {
           "id": {
             "type": "string",
+            "pattern": "^[0-9]+$",
             "description": "QQ uin"
           },
           "master": {
@@ -147,6 +149,10 @@
           "ntLogin": {
             "type": "boolean",
             "description": "是否使用 NT 登录方式"
+          },
+          "commandPrefix": {
+            "type": "string",
+            "description": "本 endpoint 的命令前缀"
           }
         },
         "required": ["id"]

package/src/content-resolver.ts

@@ -0,0 +1,131 @@
+import type { Client } from '@icqqjs/icqq';
+import type {
+  EndpointContentPort,
+  EndpointContentResolveContext,
+} from 'zhin.js/adapter';
+import type {
+  ConversationMessage,
+  ConversationReference,
+  ForwardEntry,
+  Segment,
+} from '@zhin.js/im-contract';
+import { normalizeForwardMsgResponse } from './forward-msg.js';
+
+/** Owns ICQQ-observed message content and recursive merged-forward expansion. */
+export class IcqqContentResolver {
+  readonly #client: Client;
+  readonly #messages = new Map<string, ConversationMessage>();
+
+  readonly port: EndpointContentPort = Object.freeze({
+    resolve: (
+      reference: ConversationReference,
+      context: EndpointContentResolveContext,
+    ) => this.#resolve(reference, context),
+  });
+
+  constructor(client: Client) {
+    this.#client = client;
+  }
+
+  remember(messageId: string, message: ConversationMessage): void {
+    this.#messages.set(messageId, message);
+  }
+
+  async #resolve(
+    reference: ConversationReference,
+    context: EndpointContentResolveContext,
+  ) {
+    context.signal.throwIfAborted();
+    if (reference.kind === 'message') {
+      const cached = this.#messages.get(reference.message.id);
+      return cached
+        ? Object.freeze({ status: 'resolved' as const, reference, value: cached })
+        : Object.freeze({ status: 'not_found' as const, code: 'icqq_message_not_observed' });
+    }
+    if (reference.kind === 'forward') {
+      try {
+        const entries = await this.#resolveForwardEntries(
+          reference.forwardId,
+          context,
+          { remainingEntries: context.maxEntries, path: new Set<string>() },
+          0,
+        );
+        if (entries.length === 0) {
+          return Object.freeze({ status: 'not_found' as const, code: 'icqq_forward_not_found' });
+        }
+        return Object.freeze({
+          status: 'resolved' as const,
+          reference,
+          value: Object.freeze(entries),
+        });
+      } catch (error) {
+        if (context.signal.aborted) throw error;
+        return Object.freeze({
+          status: 'failed' as const,
+          code: 'icqq_forward_fetch_failed',
+          message: error instanceof Error ? error.message : String(error),
+        });
+      }
+    }
+    if (
+      reference.media.kind === 'url'
+      || reference.media.kind === 'base64'
+      || reference.media.kind === 'path'
+    ) {
+      return Object.freeze({ status: 'resolved' as const, reference, value: reference.media });
+    }
+    return Object.freeze({
+      status: 'unsupported' as const,
+      code: 'icqq_media_reference_unsupported',
+    });
+  }
+
+  async #resolveForwardEntries(
+    forwardId: string,
+    context: EndpointContentResolveContext,
+    state: { remainingEntries: number; readonly path: Set<string> },
+    depth: number,
+  ): Promise<readonly ForwardEntry[]> {
+    context.signal.throwIfAborted();
+    if (state.remainingEntries <= 0 || state.path.has(forwardId)) return Object.freeze([]);
+    state.path.add(forwardId);
+    try {
+      // ICQQ has no cancellable getForwardMsg API. Keep the generation lease
+      // until the native operation settles, then honor cancellation.
+      const raw = await this.#client.getForwardMsg(forwardId);
+      context.signal.throwIfAborted();
+      const entries = normalizeForwardMsgResponse(raw).slice(0, state.remainingEntries);
+      state.remainingEntries -= entries.length;
+      const expanded: ForwardEntry[] = [];
+      for (const entry of entries) {
+        context.signal.throwIfAborted();
+        const segments: Segment[] = [];
+        for (const segment of entry.segments) {
+          if (segment.type !== 'forward' || depth >= context.maxDepth) {
+            segments.push(segment);
+            continue;
+          }
+          const nestedId = String(
+            (segment.data as { forward_id?: unknown }).forward_id ?? '',
+          ).trim();
+          if (!nestedId || state.path.has(nestedId) || state.remainingEntries <= 0) {
+            segments.push(segment);
+            continue;
+          }
+          const nested = await this.#resolveForwardEntries(nestedId, context, state, depth + 1);
+          segments.push(Object.freeze({
+            ...segment,
+            data: Object.freeze({
+              ...segment.data,
+              ...(nested.length > 0 ? { entries: nested } : {}),
+            }),
+          }));
+        }
+        expanded.push(Object.freeze({ ...entry, segments: Object.freeze(segments) }));
+      }
+      return Object.freeze(expanded);
+    } finally {
+      state.path.delete(forwardId);
+    }
+  }
+}

package/src/cq-message.ts

@@ -1,5 +1,5 @@
 /** ICQQ 历史文本视图 → canonical MessageSegment。出站只使用原生 Sendable。 */
-import { isMediaRef, type MediaRef } from "@zhin.js/core";
+import { isMediaRef, type MediaRef } from '@zhin.js/im-contract';
 import type { MessageSegment } from "zhin.js";
 
 const MAX_CQ_PARSE_LEN = 256_000;