@zhin.js/adapter-icqq 8.0.8 → 8.0.10

package/schema.json

@@ -4,34 +4,75 @@
   "additionalProperties": false,
   "properties": {
     "master": {
-      "type": [
-        "string",
-        "number"
-      ],
+      "type": ["string", "number"],
       "description": "框架 master QQ uin（/approve、AI/工具权限）；endpoints[i].master 可逐项覆盖"
     },
     "trusted": {
       "type": "array",
-      "items": {
-        "type": [
-          "string",
-          "number"
-        ],
-        "description": "Trusted QQ uin"
-      },
+      "items": { "type": ["string", "number"] },
       "description": "框架 trusted QQ uin 列表（弱于 master）"
     },
+    "password": {
+      "type": "string",
+      "description": "QQ 密码（可选，不填则扫码登录）"
+    },
+    "platform": {
+      "type": "number",
+      "enum": [1, 2, 3, 4, 5, 6, 7],
+      "default": 1,
+      "description": "登录设备平台：1=Android, 2=aPad, 3=Watch, 4=iMac, 5=iPad, 6=Tim, 7=Custom"
+    },
+    "ver": {
+      "type": "string",
+      "description": "协议版本号，仅在对应 platform 有多个版本时有效，不填则使用最新版本"
+    },
+    "signApiAddr": {
+      "type": "string",
+      "description": "签名服务器地址；未配置时若安装了 @icqqjs/qqsign 则自动使用本地签名"
+    },
+    "dataDir": {
+      "type": "string",
+      "description": "数据存储文件夹路径，默认为主模块下的 data 文件夹"
+    },
     "autoReconnect": {
       "type": "boolean",
-      "default": true
+      "default": true,
+      "description": "断线后是否自动重连（默认 true）"
     },
     "outboundMedia": {
       "type": "string",
-      "enum": [
-        "file",
-        "base64"
-      ],
-      "description": "file=local path (same host as daemon); base64=CQ base64:// (default when rpc set)"
+      "enum": ["file", "base64"],
+      "default": "file",
+      "description": "出站媒体模式：file=落盘本地路径（默认）; base64=CQ base64:// 内联"
+    },
+    "ignoreSelf": {
+      "type": "boolean",
+      "default": true,
+      "description": "群聊和频道中是否过滤自己的消息（默认 true）"
+    },
+    "resend": {
+      "type": "boolean",
+      "default": false,
+      "description": "被风控时是否尝试用分片发送（默认 false）"
+    },
+    "cacheGroupMember": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否缓存群员列表（默认 true）；群多时（500+）会多占约 100MB+ 内存"
+    },
+    "autoServer": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否自动选择最优服务器（默认 true）"
+    },
+    "qqnt": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否使用 QQNT 协议（默认 true）"
+    },
+    "ntLogin": {
+      "type": "boolean",
+      "description": "是否使用 NT 登录方式"
     },
     "endpoints": {
       "type": "array",
@@ -40,65 +81,82 @@
         "type": "object",
         "additionalProperties": true,
         "properties": {
+          "id": {
+            "type": "string",
+            "description": "QQ uin"
+          },
           "master": {
-            "type": [
-              "string",
-              "number"
-            ],
-            "description": "本 endpoint 的框架 master QQ uin；覆盖顶层 master"
+            "type": ["string", "number"],
+            "description": "本 endpoint 的 master QQ uin；覆盖顶层 master"
           },
           "trusted": {
             "type": "array",
-            "items": {
-              "type": [
-                "string",
-                "number"
-              ],
-              "description": "Trusted QQ uin"
-            },
+            "items": { "type": ["string", "number"] },
             "description": "本 endpoint 的 trusted 列表"
           },
-          "rpc": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "host": {
-                "type": "string",
-                "description": "RPC host"
-              },
-              "port": {
-                "type": "number",
-                "description": "RPC port"
-              },
-              "token": {
-                "type": "string",
-                "description": "RPC token"
-              }
-            },
-            "required": [
-              "host",
-              "port",
-              "token"
-            ]
+          "password": {
+            "type": "string",
+            "description": "本 endpoint 的 QQ 密码"
+          },
+          "platform": {
+            "type": "number",
+            "enum": [1, 2, 3, 4, 5, 6, 7],
+            "description": "登录设备平台：1=Android, 2=aPad, 3=Watch, 4=iMac, 5=iPad, 6=Tim, 7=Custom"
           },
-          "id": {
+          "ver": {
+            "type": "string",
+            "description": "协议版本号"
+          },
+          "signApiAddr": {
+            "type": "string",
+            "description": "签名服务器地址"
+          },
+          "dataDir": {
             "type": "string",
-            "description": "QQ uin (must match icqq login account)"
+            "description": "数据存储文件夹路径"
+          },
+          "autoReconnect": {
+            "type": "boolean",
+            "description": "断线后是否自动重连"
+          },
+          "outboundMedia": {
+            "type": "string",
+            "enum": ["file", "base64"],
+            "description": "出站媒体模式"
+          },
+          "ignoreSelf": {
+            "type": "boolean",
+            "description": "是否过滤自己的消息"
+          },
+          "resend": {
+            "type": "boolean",
+            "description": "被风控时是否分片发送"
+          },
+          "cacheGroupMember": {
+            "type": "boolean",
+            "description": "是否缓存群员列表"
+          },
+          "autoServer": {
+            "type": "boolean",
+            "description": "是否自动选择最优服务器"
+          },
+          "qqnt": {
+            "type": "boolean",
+            "description": "是否使用 QQNT 协议"
+          },
+          "ntLogin": {
+            "type": "boolean",
+            "description": "是否使用 NT 登录方式"
           }
         },
-        "required": [
-          "id"
-        ]
+        "required": ["id"]
       }
     },
     "commandPrefix": {
       "type": "string",
       "default": "",
-      "description": "命令前缀（默认 '' 无前缀，任意文本按命令匹配；如 '/' 要求 / 开头）。endpoints[i] 可逐项覆盖"
+      "description": "命令前缀（默认 '' 无前缀）。endpoints[i] 可逐项覆盖"
     }
   },
-  "required": [
-    "master",
-    "endpoints"
-  ]
+  "required": ["master", "endpoints"]
 }

package/src/agent-prompt.ts

@@ -9,7 +9,7 @@ import { filterTools, type AgentTool } from 'zhin.js/ai';
 function isIcqqDelegatedTask(query: string, goal: string): boolean {
   const text = `${query} ${goal}`;
   const lower = text.toLowerCase();
-  if (/\bicqq\b|mcp_icqq|send_private_msg|friend\s+send/i.test(text)) return true;
+  if (/\bicqq\b|icqq__|send_private_msg|friend\s+send/i.test(text)) return true;
   if (/\bfriend\s+like\b/.test(lower) && /qq|好友|\d{5,}/i.test(text)) return true;
   if (/点赞/.test(text) && /qq|好友|\d{5,}/i.test(text)) return true;
   if (/发消息|发送消息|私聊/.test(text) && /qq|\d{5,}/i.test(text)) return true;
@@ -23,27 +23,22 @@ function selectIcqqDeferredTools(
   maxTools: number,
 ): DeferredToolCatalogItem[] {
   const pool = deferredCatalog.filter(
-    t => !t.name.startsWith('mcp_filesystem') && !t.name.startsWith('mcp_memory_'),
+    t => !t.name.startsWith('mcp_filesystem')
+      && !t.name.startsWith('mcp_memory_')
+      && !t.name.startsWith('mcp_icqq_'),
   );
-  const icqqMcpTools = pool.filter(t => t.name.startsWith('mcp_icqq_'));
-  const icqqTools = pool.filter(t => t.name.startsWith('icqq_'));
+  const icqqTools = pool.filter(t => t.name.startsWith('icqq__') || t.name.startsWith('icqq_'));
   const pinned: DeferredToolCatalogItem[] = [];
-  const bash = pool.find(t => t.name === 'bash');
-  if (bash) pinned.push(bash);
   const preferOrder = [
-    'mcp_icqq_icqq_invoke',
-    'mcp_icqq_icqq_list_actions',
-    'icqq_send_user_like',
-    'icqq_friend_list',
-    'icqq_poke',
+    'icqq__send_user_like',
+    'icqq__friend_list',
+    'icqq__poke',
   ];
   for (const name of preferOrder) {
-    const t =
-      icqqMcpTools.find(x => x.name === name) ??
-      icqqTools.find(x => x.name === name);
+    const t = icqqTools.find(x => x.name === name);
     if (t) pinned.push(t);
   }
-  for (const t of [...icqqMcpTools, ...icqqTools]) {
+  for (const t of icqqTools) {
     if (pinned.length >= maxTools) break;
     if (!pinned.some(p => p.name === t.name)) pinned.push(t);
   }
@@ -61,16 +56,16 @@ function selectIcqqDeferredTools(
 }
 
 const ORCHESTRATOR_ICQQ = [
-  'On icqq/QQ: use run_deferred_task with tool_query "mcp_icqq_icqq_invoke" or "icqq_send_user_like".',
-  'Examples: send_private_msg, friend_like; do not use mcp_filesystem_* for QQ tasks.',
-  'Skip tool_search when the user clearly asks to send a message, like a friend, or poke on QQ.',
+  'On icqq/QQ: if icqq__send_user_like is in your tool list, call it now with { endpoint_id, user_id, times }.',
+  'endpoint_id is this bot QQ (Session endpoint). user_id is the sender to like. times is 1-20.',
+  'Do not tell the user the tool is missing until you have called it this turn (or load_tool("icqq__send_user_like") failed).',
+  'Ignore prior turns that said the like tool was unavailable. Other social tools: icqq__poke, icqq__friend_list.',
 ].join('\n');
 
 const WORKER_ICQQ = [
-  'Send private message: `mcp_icqq_icqq_invoke` action `send_private_msg` params `{ user_id, message }`, or bash `icqq friend send <uid> "<text>"`.',
-  'Friend like: action `friend_like` or `icqq_send_user_like`, or bash `icqq friend like <uid> -t <times>`.',
-  'Use `icqq_list_actions` only if action name is unclear.',
-  'Do NOT use mcp_filesystem_* or explore node_modules / package.json to "discover" icqq.',
+  'Friend like: load_tool("icqq__send_user_like") then call with { endpoint_id, user_id, times }. endpoint_id is this bot QQ (origin.endpoint).',
+  'Poke: icqq__poke. Friend list: icqq__friend_list.',
+  'Do NOT use mcp_icqq_*, mcp_filesystem_*, or bash `icqq friend like`.',
   'Do not stop at --help; execute the action the goal describes.',
 ].map(line => `- ${line}`).join('\n');
 

package/src/cq-message.ts

@@ -83,6 +83,9 @@ function pushCqSegment(segments: MessageSegment[], type: string, arg: string): v
     case "reply":
       segments.push({ type: "reply", data: { message_id: arg } });
       break;
+    case "json":
+      segments.push({ type: "json", data: { text: arg } });
+      break;
     default:
       segments.push({ type, data: { text: `[${type}:${arg}]` } });
       break;
@@ -125,8 +128,8 @@ export function parseCqMessage(raw: string): MessageSegment[] {
   return segments.length ? segments : [{ type: "text", data: { text: raw } }];
 }
 
-/** 构建 icqq IPC send_*_msg 的 message 字符串（非空） */
-export function buildIcqqIpcMessage(content: SendContent): string {
+/** 构建 icqq send_*_msg 的 message 字符串（非空） */
+export function buildIcqqMessage(content: SendContent): string {
   let message = toCqString(content).trim();
   if (!message) message = "\u200b";
   return message;
@@ -167,6 +170,8 @@ export function toCqString(content: SendContent): string {
         }
         case "reply":
           return `[reply:${data.message_id ?? data.id}]`;
+        case "json":
+          return `[json:${data.text ?? ''}]`;
         default:
           return segment.toString(seg);
       }