@zhin.js/adapter-icqq 1.1.16 → 1.1.18

package/lib/protocol.js

@@ -1,4 +1,5 @@
 import { isMediaRef } from '@zhin.js/im-contract';
+import { resolveAdapterNotifyTarget } from 'zhin.js/adapter';
 import { resolveIcqqMediaFile } from "./cq-message.js";
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
 /**
@@ -190,6 +191,7 @@ export function resolveIcqqConfig(config) {
     const autoServer = config.autoServer ?? true;
     const qqnt = config.qqnt;
     const ntLogin = config.ntLogin;
+    const notify = resolveAdapterNotifyTarget(config.notify);
     return {
         context: 'icqq',
         id,
@@ -206,6 +208,7 @@ export function resolveIcqqConfig(config) {
         ...(autoServer != null ? { autoServer } : {}),
         ...(qqnt != null ? { qqnt } : {}),
         ...(ntLogin != null ? { ntLogin } : {}),
+        ...(notify ? { notify } : {}),
     };
 }
 /**
@@ -232,7 +235,8 @@ export function icqqInboundConversation(endpointKey, input) {
             parent: { kind: 'channel', id: input.guildId },
         };
     }
-    return { endpoint, kind: input.channelType, id: input.channelId };
+    const name = input.channelType === 'group' ? input.name?.trim() : undefined;
+    return { endpoint, kind: input.channelType, id: input.channelId, ...(name ? { name } : {}) };
 }
 /**
  * 出站：从 ConversationRef 派生 action 路由。
@@ -325,22 +329,34 @@ export function formatOutboundBody(payload) {
  * quote or whitespace are dropped: a standalone element cannot carry the quote.
  */
 export function formatOutboundMessages(payload) {
+    return formatOutboundMessageParts(payload).map(part => part.message);
+}
+export function formatOutboundMessageParts(payload) {
     if (!Array.isArray(payload)) {
-        return isWireSegment(payload) ? formatOutboundMessages([payload]) : [formatOutboundBody(payload)];
+        if (isWireSegment(payload))
+            return formatOutboundMessageParts([payload]);
+        const message = formatOutboundBody(payload);
+        return [{ message, ...(typeof payload === 'string' && message !== payload ? {} : { sourceIndices: [0] }) }];
     }
     const groups = [[]];
-    for (const element of formatOutboundElements(payload)) {
-        if (isStandaloneElement(element))
-            groups.push([element], []);
-        else
-            groups.at(-1).push(element);
+    for (const [sourceIndex, source] of payload.entries()) {
+        for (const element of formatOutboundElements([source])) {
+            const item = { element, sourceIndex };
+            if (isStandaloneElement(element))
+                groups.push([item], []);
+            else
+                groups.at(-1).push(item);
+        }
     }
-    const messages = groups.filter(group => group.some(element => typeof element === 'string'
+    const messages = groups.filter(group => group.some(({ element }) => typeof element === 'string'
         ? element.trim() !== ''
         : element.type !== 'reply' && element.type !== 'quote'));
     if (messages.length === 0)
-        return ['\u200b'];
-    return messages.map(group => group.length === 1 ? group[0] : group);
+        return [{ message: '\u200b', sourceIndices: [] }];
+    return messages.map(group => ({
+        message: group.length === 1 ? group[0].element : group.map(item => item.element),
+        sourceIndices: [...new Set(group.map(item => item.sourceIndex))],
+    }));
 }
 function isStandaloneElement(element) {
     return typeof element !== 'string' && ICQQ_STANDALONE_ELEMENTS.has(element.type);
@@ -362,7 +378,8 @@ function formatOutboundElements(payload) {
                 if (!Number.isSafeInteger(qq) || qq <= 0) {
                     throw new TypeError(`Invalid ICQQ mention target: ${String(target ?? '')}`);
                 }
-                return { type: 'at', qq };
+                const name = typeof item.data?.name === 'string' ? item.data.name.trim() : '';
+                return name ? { type: 'at', qq, text: name.startsWith('@') ? name : `@${name}` } : { type: 'at', qq };
             }
             case 'image': {
                 const arg = resolveIcqqMediaFile(normalizeIcqqImageData(item.data));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,24 +33,27 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.23",
+    "@zhin.js/adapter": "1.1.25",
     "@zhin.js/agent-feature": "1.1.10",
-    "@zhin.js/core": "1.1.51",
+    "@zhin.js/client": "1.1.21",
+    "@zhin.js/console-contract": "1.1.3",
+    "@zhin.js/core": "1.1.53",
     "@zhin.js/feature-kit": "1.1.9",
-    "@zhin.js/im-contract": "1.1.7",
+    "@zhin.js/im-contract": "1.1.9",
     "@zhin.js/logger": "1.1.2",
+    "@zhin.js/page": "1.1.10",
     "@zhin.js/permission": "1.1.9",
     "@zhin.js/skill": "1.1.10",
-    "@zhin.js/tool": "1.1.10"
+    "@zhin.js/tool": "1.1.12"
   },
   "peerDependencies": {
     "@icqqjs/icqq": "^1.12.2",
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.23",
+    "@zhin.js/adapter": "^1.1.25",
     "@zhin.js/command": "^1.1.11",
-    "@zhin.js/core": "^1.1.51",
+    "@zhin.js/core": "^1.1.53",
     "@zhin.js/prompt-section": "^1.1.9",
-    "zhin.js": "^1.1.16"
+    "zhin.js": "^1.1.18"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
@@ -76,11 +79,12 @@
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
     "@zhin.js/prompt-section": "1.1.9",
-    "zhin.js": "1.1.16"
+    "zhin.js": "1.1.18"
   },
   "files": [
     "adapters",
     "commands",
+    "pages",
     "plugin.js",
     "schema.json",
     "src",
@@ -124,6 +128,10 @@
       {
         "package": "@zhin.js/agent-feature",
         "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/page",
+        "api": "^1.0.0"
       }
     ],
     "plugins": []

package/pages/index/index.js

@@ -0,0 +1,15 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { definePage } from '@zhin.js/console-contract';
+import { createAdapterConsolePage } from '@zhin.js/client';
+export const meta = definePage({
+    title: 'ICQQ',
+    titleI18n: { en: 'ICQQ' },
+    icon: 'MessageCircle',
+    order: 64,
+    requiredPermissions: ['icqq:read'],
+});
+/**
+ * Convention page: `pages/index/index.ts` → `/icqq`（插件路径）。
+ * 连接状态、连接测试、endpoint 增删；登录待办来自 LoginAssist（ICQQ 等）。
+ */
+export default createAdapterConsolePage('icqq');

package/pages/index/index.ts

@@ -0,0 +1,16 @@
+import { definePage } from '@zhin.js/console-contract';
+import { createAdapterConsolePage } from '@zhin.js/client';
+
+export const meta = definePage({
+  title: 'ICQQ',
+  titleI18n: { en: 'ICQQ' },
+  icon: 'MessageCircle',
+  order: 64,
+  requiredPermissions: ['icqq:read'],
+});
+
+/**
+ * Convention page: `pages/index/index.ts` → `/icqq`（插件路径）。
+ * 连接状态、连接测试、endpoint 增删；登录待办来自 LoginAssist（ICQQ 等）。
+ */
+export default createAdapterConsolePage('icqq');

package/plugin.js

@@ -1,8 +1,10 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { createEndpointRuntimeState } from 'zhin.js/adapter';
-import { definePlugin } from 'zhin.js';
+import { definePlugin, pluginConsoleRpcToken } from 'zhin.js';
 import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { icqqRuntimeStateToken } from "./lib/icqq-runtime-state.js";
+import { icqqLoginControlToken } from "./lib/icqq-login-control.js";
+import { createIcqqConsoleRpc } from "./lib/console.js";
 export default definePlugin({
     name: 'icqq',
     metadata: {
@@ -11,6 +13,9 @@ export default definePlugin({
     setup(context) {
         // 运行中 endpoint 注册表（icqq endpoint list 的"运行中"数据源）
         context.resources.provide(icqqRuntimeStateToken, createEndpointRuntimeState());
+        // 掉线恢复命令用：当前 generation 每个 UIN 的登录控制面
+        context.resources.provide(icqqLoginControlToken, new Map());
+        context.resources.provide(pluginConsoleRpcToken, createIcqqConsoleRpc(context.resources, () => context.config.get()));
         const disposePlatform = context.resources.has(permissionHostToken)
             ? context.resources.use(permissionHostToken).registerPlatform('icqq', createSceneRolePlatformChecker())
             : undefined;

package/schema.json

@@ -346,6 +346,93 @@
                 "description": "Command prefix for this endpoint."
               }
             }
+          },
+          "notify": {
+            "type": "object",
+            "additionalProperties": false,
+            "description": "掉线/登录失败时通过另一个适配器实例给 master 发通知（adapter/endpoint/kind/id 指向实际会话）",
+            "x-i18n": {
+              "en": {
+                "description": "Send outage/login notices to the master through another adapter instance (adapter/endpoint/kind/id identify the actual conversation)."
+              }
+            },
+            "properties": {
+              "adapter": {
+                "type": "string",
+                "description": "通知使用的适配器类型，如 qq / icqq",
+                "x-i18n": {
+                  "en": {
+                    "description": "Adapter type used for the notice, such as qq or icqq."
+                  }
+                }
+              },
+              "endpoint": {
+                "type": "string",
+                "description": "该适配器的 endpoint id",
+                "x-i18n": {
+                  "en": {
+                    "description": "Endpoint id of that adapter."
+                  }
+                }
+              },
+              "kind": {
+                "type": "string",
+                "enum": [
+                  "private",
+                  "group",
+                  "channel"
+                ],
+                "default": "private",
+                "description": "会话类型，默认 private",
+                "x-i18n": {
+                  "en": {
+                    "description": "Conversation kind; defaults to private."
+                  }
+                }
+              },
+              "id": {
+                "type": [
+                  "string",
+                  "number"
+                ],
+                "description": "master 在该平台上的会话 id（QQ 官方为 openid，ICQQ 为 QQ 号）",
+                "x-i18n": {
+                  "en": {
+                    "description": "Master conversation id on that platform (openid for QQ official, QQ number for ICQQ)."
+                  }
+                }
+              },
+              "parent": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                  "kind": {
+                    "type": "string",
+                    "enum": [
+                      "private",
+                      "group",
+                      "channel"
+                    ]
+                  },
+                  "id": {
+                    "type": [
+                      "string",
+                      "number"
+                    ]
+                  }
+                },
+                "required": [
+                  "kind",
+                  "id"
+                ],
+                "description": "可选的父频道/群容器"
+              }
+            },
+            "required": [
+              "adapter",
+              "endpoint",
+              "id"
+            ]
           }
         },
         "required": [
@@ -367,6 +454,93 @@
           "description": "Command prefix, empty by default. Each endpoints[i] can override it."
         }
       }
+    },
+    "notify": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "掉线/登录失败时通过另一个适配器实例给 master 发通知（adapter/endpoint/kind/id 指向实际会话）",
+      "x-i18n": {
+        "en": {
+          "description": "Send outage/login notices to the master through another adapter instance (adapter/endpoint/kind/id identify the actual conversation)."
+        }
+      },
+      "properties": {
+        "adapter": {
+          "type": "string",
+          "description": "通知使用的适配器类型，如 qq / icqq",
+          "x-i18n": {
+            "en": {
+              "description": "Adapter type used for the notice, such as qq or icqq."
+            }
+          }
+        },
+        "endpoint": {
+          "type": "string",
+          "description": "该适配器的 endpoint id",
+          "x-i18n": {
+            "en": {
+              "description": "Endpoint id of that adapter."
+            }
+          }
+        },
+        "kind": {
+          "type": "string",
+          "enum": [
+            "private",
+            "group",
+            "channel"
+          ],
+          "default": "private",
+          "description": "会话类型，默认 private",
+          "x-i18n": {
+            "en": {
+              "description": "Conversation kind; defaults to private."
+            }
+          }
+        },
+        "id": {
+          "type": [
+            "string",
+            "number"
+          ],
+          "description": "master 在该平台上的会话 id（QQ 官方为 openid，ICQQ 为 QQ 号）",
+          "x-i18n": {
+            "en": {
+              "description": "Master conversation id on that platform (openid for QQ official, QQ number for ICQQ)."
+            }
+          }
+        },
+        "parent": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "kind": {
+              "type": "string",
+              "enum": [
+                "private",
+                "group",
+                "channel"
+              ]
+            },
+            "id": {
+              "type": [
+                "string",
+                "number"
+              ]
+            }
+          },
+          "required": [
+            "kind",
+            "id"
+          ],
+          "description": "可选的父频道/群容器"
+        }
+      },
+      "required": [
+        "adapter",
+        "endpoint",
+        "id"
+      ]
     }
   },
   "required": [

package/src/console-spec.ts

@@ -0,0 +1,17 @@
+/**
+ * ICQQ Console 页面元数据（浏览器与服务端共享；不要在这里 import 服务端代码）。
+ */
+import type { AdapterConsoleField } from 'zhin.js/adapter';
+
+export const icqqConsoleSpec = {
+  adapterKey: 'icqq',
+  adapterDisplayName: 'ICQQ',
+  fields: [
+  ] as readonly AdapterConsoleField[],
+  docsUrl: 'https://zhin.js.org/adapters/icqq',
+  readPermission: 'icqq:read',
+  writePermission: 'icqq:write',
+  idPattern: /^\d+$/,
+  idHint: 'ICQQ endpoint id 是 QQ 号（纯数字）',
+  idHintI18n: { en: 'ICQQ endpoint ID is the QQ number (digits only)' },
+} as const;

package/src/console.ts

@@ -0,0 +1,21 @@
+/**
+ * ICQQ Console RPC：运行状态 + endpoint 增删（原 `icqq endpoint` 聊天命令）。
+ *
+ * 页面绑定 `pages/index`，读取 / 写入分别要求 `<adapter>:read` / `<adapter>:write`。
+ */
+import { createAdapterConsoleRpc, type AdapterConsoleResources } from 'zhin.js/adapter';
+import type { PluginConsoleRpc } from 'zhin.js';
+import { icqqRuntimeStateToken } from './icqq-runtime-state.js';
+import { icqqConsoleSpec } from './console-spec.js';
+
+export function createIcqqConsoleRpc(
+  resources: AdapterConsoleResources,
+  getConfig: () => unknown,
+): PluginConsoleRpc {
+  const state = resources.use(icqqRuntimeStateToken);
+  return createAdapterConsoleRpc({
+    ...icqqConsoleSpec,
+    running: () => state.endpoints.values(),
+    getConfig,
+  }, resources);
+}