@zhin.js/adapter-icqq 1.1.29 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,70 @@
 # @zhin.js/adapter-icqq
 
+## 1.2.0
+
+### Minor Changes
+
+- 8bf8dfa: #1250 第 10 批（试用反馈、关键修复与 AI 账号）的公开 API 新增按 minor 发布：Console 协议的功能未启用状态、功能矩阵分类与传输状态文字；Host 端口校验与 owner 判定导出；网关项目标识与插件候选；Agent 运行时的连接测试与 Host 环境变量引用授权；模型请求首响应时限；`zhin ai` 命令与 `--allow-unverified-host`；日志单行转义导出；Host 根配置新增 `firstResponseTimeoutMs`，icqq 新增 `logLevel` 配置（按 commandSuggestion 先例为 minor）。
+
+### Patch Changes
+
+- da9dc8a: 聊天角色引导文案（ADR 0060 P0）：需要 zhin 角色的命令被拒绝时，回复说明去哪里获得角色（联系主人 / Console「聊天角色」页），不点名缺哪个角色或谁持有；发言者是群主 / 群管理员时另说明平台身份不等于 zhin 角色。`功能` / `角色` 的拒绝回复同样指向 Console，尚无全局 owner 时提示认领码；Agent 信任档位的限制说明改为「联系主人授予 trusted 角色」。Sandbox 页把模拟的「Master」改称「群主（平台身份）」，并显示服务端解析的 zhin 角色与 Agent 信任档位（入站回显帧新增 `senderChatRole` / `senderTrustLevel`）。ICQQ README 去掉已不读取的 `master`「必填」写法。
+- 35e5d89: 日志里的聊天内容不再能伪造日志行、群聊全文默认不落盘（#1250）：
+
+  - `@zhin.js/logger`：新增 `escapeLogText()`（换行写成 `⏎`，ANSI 等控制字符转义为 `\uXXXX`，保留制表符）与 `LOG_CONTENT_MAX_LENGTH`（300）。记录消息内容用的 `truncatePreview()` 现在总是转义成单行，未指定长度时截断到 300 字（原先不截断）。
+  - ICQQ 适配器：SDK 自己的 log4js 输出改由适配器转写到 Zhin 日志（同一格式，输出不是终端时没有 ANSI 颜色），继续脱敏验证链接和手机号。新增配置项 `logLevel`（`trace`…`mark` / `off`，默认 `warn`，原先写死 `info`），SDK 逐条打印的收发消息原文（`recv from: …`、`succeed to send: …`）一律按 `debug` 处理，默认不写入日志；打开时转义成单行并截断。
+
+- Updated dependencies [8bf8dfa]
+- Updated dependencies [da9dc8a]
+- Updated dependencies [bc31cd3]
+- Updated dependencies [760e9f5]
+- Updated dependencies [5d90159]
+- Updated dependencies [73475bd]
+- Updated dependencies [35e5d89]
+- Updated dependencies [809c6ee]
+  - @zhin.js/logger@1.2.0
+  - @zhin.js/core@1.9.0
+  - @zhin.js/adapter@1.3.1
+  - @zhin.js/adapter-onebot-events@0.0.10
+
+## 1.1.30
+
+### Patch Changes
+
+- e6d7cc1: 配置表单与插件显示名的多语言约定（#1250）：Schema 节点沿用已有的 `x-i18n`（`Schema#i18n()`），按 `zh-CN` / `en` 分别声明字段的 `title`、`description` 与 `enumLabels`；插件 `metadata`（`definePlugin` 或 `package.json#zhin.metadata`）新增可选的 `displayNameI18n: { 'zh-CN'?, en? }`，与 `displayName` 一样只能在一处声明，清单只接受这两个键且值必须是非空字符串。Console 插件列表（`/api/plugins`、插件详情）和 `feature.list` / `feature.matrix` 原样带出 `displayNameI18n`，由 Console 按界面语言选择（当前语言 → `en` → `displayName` → 实例 key）。没有这些字段时行为不变。
+
+  官方插件补齐中英文配置字段标题与说明（group-suite、repeater、roulette、answers、calendar、ledger、reminder、rss、earthquake、bilibili、content-moderation、lottery、nettools、60s、process-monitor、activity-feedback）以及全部官方插件的中英文显示名。
+
+- 7cd299e: ICQQ `system.*` 事件按语义分级记录（#1250）：上线（`system.online`）与等待人工处理的登录验证（二维码、设备锁、滑块、身份验证）记为 INFO，只有登录失败（`system.login.error`）与掉线（`system.offline*`）记为 WARN，正常登录不再进入「历史警告」。
+- 70ddaf4: 插件市场元数据（#1250 marketplace-metadata）：`package.json#zhin.metadata` 新增可选的 `descriptionI18n: { 'zh-CN'?, en? }`（本地化描述）与 `category`（`adapter`、`ai`、`admin`、`community`、`entertainment`、`game`、`information`、`moderation`、`service`、`utility` 之一），校验方式与 `displayNameI18n` 相同：只接受这两个语言键、值为非空字符串、分类必须在枚举内。这两个字段只能写在清单里，插件市场才能从发布的 `package.json` 读到。`@zhin.js/plugin-runtime` 导出 `PLUGIN_CATEGORIES`、`PLUGIN_CATEGORY_LABELS`、`informativeKeywords`、`packageAuthorName`、`readPluginMarketplaceMetadata` 等读取工具。
+
+  市场读取侧：`/pub/marketplace/search` 带出 `displayNameI18n` / `descriptionI18n`，分类读声明的 `category`（旧索引的 `util` 等按别名映射），可选 `locale=zh-CN|en` 按语言解析显示名与描述，并按两种语言的名称与描述搜索；`/pub/marketplace/detail/*` 带出发布清单的显示名、描述翻译与分类。作者一律取 `author`（没有时取 `maintainers`），不再显示发布账号——此前 `plugins.json` 生成脚本优先读 `_npmUser`，CI 可信发布的包因此都显示为「GitHub Actions」。keywords 去掉 `zhin`、`zhin.js`、`bot` 等通用词后展示与参与搜索。`zhin search` / `zhin info` 同样显示中文描述、分类和维护者，`zhin info` 不再读不存在的 `zhin.displayName` / `zhin.category`。
+
+  官方插件与适配器：显示名移到 `package.json#zhin.metadata`，补齐中英文描述、分类、3–6 个有信息量的 keywords，author 统一为 `{ name: "lc-cn", url: "https://github.com/zhinjs/zhin" }`（不再发布邮箱）；npm `description` 与英文描述一致。
+
+- Updated dependencies [7cd299e]
+- Updated dependencies [7cd299e]
+- Updated dependencies [9026329]
+- Updated dependencies [ccab2c1]
+- Updated dependencies [c6b5563]
+- Updated dependencies [f1a9745]
+- Updated dependencies [e0b4e51]
+- Updated dependencies [cca4427]
+- Updated dependencies [b08cff2]
+- Updated dependencies [704c7a4]
+- Updated dependencies [07bd3dc]
+  - @zhin.js/core@1.8.0
+  - @zhin.js/adapter@1.3.0
+  - @zhin.js/im-contract@1.2.0
+  - @zhin.js/console-contract@1.2.0
+  - @zhin.js/adapter-onebot-events@0.0.9
+  - @zhin.js/page@1.1.20
+  - @zhin.js/agent-feature@1.1.19
+  - @zhin.js/feature-kit@1.1.18
+  - @zhin.js/permission@1.2.2
+  - @zhin.js/skill@1.1.19
+  - @zhin.js/tool@1.1.21
+
 ## 1.1.29
 
 ### Patch Changes

package/README.md

@@ -45,13 +45,16 @@ configVersion: 2
 plugins:
   icqq: "@zhin.js/adapter-icqq"
 icqq:
-  master: "1659488338" # 必填，顶层共享（/approve 与 master 角色）
   autoReconnect: true
   endpoints:
     - id: "${ICQQ_ACCOUNT}" # QQ 号
       # password: "${ICQQ_PASSWORD}"  # 可选；不填则扫码登录
 ```
 
+::: tip 主人不在适配器配置里
+`master` 不再是适配器字段（也不是必填）。「谁是主人」由聊天角色决定（ADR 0056 / ADR 0060）：在 Console「聊天角色」中授予全局 owner，或在新部署中按 `zhin status` 给出的认领码私聊机器人发送 `认领 <码>`。旧配置中的 `master` 会在首次启动时迁移为账号层 owner；之后再写入不会自动授予，而是进入 Console「需要你处理」等待确认（见[升级到聊天角色](https://zhin.js.org/migrations/chat-roles)）。
+:::
+
 多账号：一个插件实例挂多个 endpoint（`endpoints` 数组逐项覆盖顶层字段，`id` 必填）：
 
 ```yaml
@@ -59,7 +62,6 @@ configVersion: 2
 plugins:
   icqq: "@zhin.js/adapter-icqq"
 icqq:
-  master: "1659488338"
   endpoints:
     - id: "${ICQQ_ACCOUNT}"
     - id: "${ICQQ_ACCOUNT_2}"
@@ -205,7 +207,8 @@ ICQQ 首次登录的二维码、滑块、设备锁会出现在「登录待办」
 - **滑块提交格式**：NT 登录（SDK 的 `sig.nt_captcha` 指向这个滑块）提交 `ticket,randstr`，缺 randstr 时会提示并留在滑块；旧版 wtlogin 只提交 `ticket`。
 - **验证链接**带会话标识（sid / sig），密保手机号也算敏感信息：
   - Zhin 自己的日志和 `system.receive` 副事件只有挑战类型和链接的主机名（`{ kind, host }`），不含链接、手机号、设备信息和二维码图片；`login.error` 只带错误码和清洗后的说明。
-  - icqq SDK 自己的日志（log4js，`mark` 级别会打印滑块、设备锁、身份验证链接和手机号）经适配器包装：链接只保留到路径（查询串变成 `?…`），手机号变成 `***`。
+  - icqq SDK 自己的日志（原本经 log4js 输出，`mark` 级别会打印滑块、设备锁、身份验证链接和手机号）改由适配器转写到 Zhin 日志（同一格式；输出不是终端时没有颜色）：链接只保留到路径（查询串变成 `?…`），手机号变成 `***`。
+  - SDK 日志级别用 `logLevel` 配置（`trace` / `debug` / `info` / `warn` / `error` / `fatal` / `mark` / `off`，默认 `warn`，可在 `endpoints[]` 里单独设置）。SDK 逐条打印的收发消息原文（`recv from: …`、`succeed to send: …`）一律按 `debug` 处理，默认不会写进日志；开到 `debug` 时，消息中的换行写成 `⏎`、控制字符转义，并截断到 300 字，多行消息不会再拆成多条没有时间戳的日志行。
   - **未覆盖**：SDK 绕过日志直接写到控制台的两处——终端里画出的登录二维码，以及旧版登录 237 分支的 `console.log(proto.toJSON())`（可能包含验证页信息）。这两处不改 SDK 无法拦截；如果控制台输出会被收集，请注意。
   - `endpoint.login.flow` 事件和历史里不含验证链接（`linkOmitted`），Console 用 `login.flow.get` 读取当前链接。
 - **设备 JSON** 只存在于当前挑战上：挑战结束即清空；不写 Zhin 的日志，不进事件和 `system.receive`。辅助脚本是固定文本，只在 `accounts.qq.com/login/attack` 上运行，只设置 `window.__INITIAL_STATE__.deviceInfo`，从不自动提交，也不含任何设备数据。
@@ -239,19 +242,18 @@ console:
 
 ## 掉线通知与重新登录
 
-配置 `notify` 后，ICQQ 被踢下线、登录失败或启动失败时，会通过另一个适配器实例给 master 发通知。例如用 QQ 官方机器人实例通知：
+配置 `notify` 后，ICQQ 被踢下线、登录失败或启动失败时，会通过另一个适配器实例给 `notify` 指向的会话（通常是部署者自己）发通知。例如用 QQ 官方机器人实例通知：
 
 ```yaml
 qq:
   # ... 已配置好的 QQ 官方机器人
 icqq:
-  master: 123456
   autoReconnect: true   # 默认 true：被踢下线后自动重新登录
   notify:
     adapter: qq
     endpoint: bot-1
     kind: private
-    id: "${QQ_MASTER_OPENID}"   # master 在 QQ 官方机器人里的 openid
+    id: "${QQ_OWNER_OPENID}"   # 接收通知的人在 QQ 官方机器人里的 openid
 ```
 
 `autoReconnect: true` 时，被踢下线会自动重试登录；出现二维码、滑块、设备锁或身份验证时，通知会提示下一步。收到通知后可以直接在 QQ 里完成：
@@ -266,7 +268,7 @@ icqq:
 
 **设备锁**：`icqq login status` 会给出验证链接。用手机 QQ 完成验证后回复 `icqq login confirm`；无法用链接验证时回复 `icqq login code sms`，收到短信后回复 `icqq login code <验证码>`。不回复 `sms` 不会发短信。身份验证需要复制设备信息，请在 Console 完成。等待验证期间不会自动重新登录（否则链接会失效）；5 分钟没有处理，挑战过期，等你重新登录。
 
-命令只接受 master（顶层或 `endpoints[i].master`）或 `notify.id` 对应账号；两者都没配置时请用 Console 的 ICQQ 页面。没有配置 `notify` 时，掉线只写日志并在 Console 显示登录待办。
+命令只接受全局 owner（聊天角色，ADR 0056）或 `notify.id` 对应账号；两者都没有时请用 Console 的 ICQQ 页面。没有配置 `notify` 时，掉线只写日志并在 Console 显示登录待办。
 
 ## 故障排查
 

package/lib/adapter.js

@@ -8,7 +8,7 @@ import { resolveIcqqConfig } from './protocol.js';
 export class IcqqAdapter extends Adapter {
     get configurationIdentityFields() { return ['id']; }
     get configurationUpdateFields() {
-        return ['password', 'platform', 'ver', 'dataDir', 'signApiAddr', 'autoReconnect', 'autoServer', 'qqnt', 'ntLogin'];
+        return ['password', 'platform', 'ver', 'dataDir', 'signApiAddr', 'autoReconnect', 'autoServer', 'qqnt', 'ntLogin', 'logLevel'];
     }
     #context;
     constructor(context) { super(); this.#context = context; }

package/lib/endpoint.d.ts

@@ -14,6 +14,12 @@ export interface IcqqEndpointOptions {
     /** Out-of-band outage notifier; absent in tests/hosts without outbound. */
     readonly notifier?: AdapterOutageNotifier;
 }
+/**
+ * Log level of an ICQQ `system.*` event by meaning: coming online and login challenges waiting for
+ * the person (QR code, device lock, slider, identity check) are normal progress (`info`); only
+ * failures (login errors, going offline) are `warn`, so a routine login stays out of the warnings.
+ */
+export declare function icqqSystemEventLogLevel(type: string): 'info' | 'warn';
 export declare class IcqqEndpoint extends ManagedIcqqClient implements Endpoint {
     #private;
     readonly [endpointSpec]: EndpointSpecification;

package/lib/endpoint.js

@@ -8,7 +8,7 @@ import { EndpointDeliveryError } from '@zhin.js/im-contract';
 import { formatCompact, getAdapterLogger, truncatePreview } from '@zhin.js/logger';
 import { IcqqLoginDriver, icqqLinkHost } from './icqq-login-assist.js';
 import { messages as t } from './i18n.js';
-import { redactingIcqqLogger } from './sdk-logger.js';
+import { bridgeIcqqSdkLogger } from './sdk-logger.js';
 import { sanitizeIcqqLoginMessage } from './icqq-login-errors.js';
 import { IcqqContentResolver } from './content-resolver.js';
 import { InboundMessageDeduper, findIcqqNestedMessageSource, isIcqqBotMentioned, isIcqqMessagePostType, normalizeIcqqInboundMessage, messageLookupFromIcqqSource, resolveIcqqQuoteIdFromEvent, resolveIcqqInboundMedia, resolveIcqqSelfUserId, shouldSkipSelfInboundMessage, } from './icqq-inbound.js';
@@ -39,6 +39,14 @@ const BOUND_EVENTS = [
     'system.login.error',
     'system.login.auth',
 ];
+/**
+ * Log level of an ICQQ `system.*` event by meaning: coming online and login challenges waiting for
+ * the person (QR code, device lock, slider, identity check) are normal progress (`info`); only
+ * failures (login errors, going offline) are `warn`, so a routine login stays out of the warnings.
+ */
+export function icqqSystemEventLogLevel(type) {
+    return type === 'online' || type.startsWith('login.') && type !== 'login.error' ? 'info' : 'warn';
+}
 export class IcqqEndpoint extends ManagedIcqqClient {
     [endpointSpec];
     #logger;
@@ -190,12 +198,14 @@ export class IcqqEndpoint extends ManagedIcqqClient {
                 },
             },
         });
-        // The SDK logs verification links (sid / sig) and the phone at `mark` level: redact them.
+        this.#logger = getAdapterLogger('icqq', options.config.id);
+        // The SDK's own log4js output is replaced by a bridge into this Zhin logger (#1250): one format,
+        // no ANSI off a terminal, `logLevel` (default warn), chat text only at debug and escaped onto one
+        // line, verification links (sid / sig) and phone numbers redacted.
         if (this.logger)
-            this.logger = redactingIcqqLogger(this.logger);
+            this.logger = bridgeIcqqSdkLogger(this.#logger, options.config.logLevel);
         this.#contentResolver = new IcqqContentResolver(this);
         this.#content = this.#contentResolver.port;
-        this.#logger = getAdapterLogger('icqq', options.config.id);
         this.#options = options;
         this.endpointName = options.config.id;
         this.#login = new IcqqLoginDriver({
@@ -969,7 +979,7 @@ export class IcqqEndpoint extends ManagedIcqqClient {
     #logSystemEvent(type, event, safe) {
         const payload = safe === undefined ? serializeIcqqEvent(event) : safe;
         const line = payload;
-        this.#logger.warn(formatCompact({
+        this.#logger[icqqSystemEventLogLevel(type)](formatCompact({
             op: `system.${type}`,
             endpoint: this.endpointName,
             ...(line ? { event: JSON.stringify(line) } : {}),
@@ -1370,7 +1380,7 @@ function resolveIcqqGroupReactionTarget(message) {
 }
 function resolveNativeClientConfig(config) {
     return {
-        log_level: 'info',
+        log_level: config.logLevel,
         platform: config.platform,
         ...(config.ver ? { ver: config.ver } : {}),
         ...(config.dataDir ? { data_dir: config.dataDir } : {}),

package/lib/protocol.d.ts

@@ -3,6 +3,7 @@ import type { Sendable } from '@icqqjs/icqq';
 import { type ConversationRef, type PlatformStanding } from '@zhin.js/im-contract';
 import { type AdapterNotifyTarget, type ResolvedAdapterNotifyTarget } from 'zhin.js/adapter';
 import type { MessageSegment, SendContent } from "zhin.js";
+import { type IcqqSdkLogLevel } from "./sdk-logger.js";
 export type ActionResult = {
     id: string;
     ok: boolean;
@@ -179,6 +180,8 @@ export interface IcqqEndpointConfig extends EndpointProfileConfiguration {
     readonly autoServer?: boolean;
     readonly qqnt?: boolean;
     readonly ntLogin?: boolean;
+    /** Level of the ICQQ SDK's own log lines (default `warn`; its per-message lines are `debug`). */
+    readonly logLevel?: IcqqSdkLogLevel;
     /** Optional out-of-band outage notification target (usually a QQ adapter instance). */
     readonly notify?: AdapterNotifyTarget;
 }
@@ -198,6 +201,7 @@ export interface ResolvedIcqqConfig {
     readonly autoServer?: boolean;
     readonly qqnt?: boolean;
     readonly ntLogin?: boolean;
+    readonly logLevel: IcqqSdkLogLevel;
     readonly notify?: ResolvedAdapterNotifyTarget;
 }
 export interface IcqqWireSegment {

package/lib/protocol.js

@@ -1,6 +1,7 @@
 import { isMediaRef } from '@zhin.js/im-contract';
 import { resolveAdapterNotifyTarget } from 'zhin.js/adapter';
 import { resolveIcqqMediaFile } from "./cq-message.js";
+import { DEFAULT_ICQQ_SDK_LOG_LEVEL, ICQQ_SDK_LOG_LEVELS, isIcqqSdkLogLevel } from "./sdk-logger.js";
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
 /**
  * 所有操作常量（@icqqjs/icqq）
@@ -192,10 +193,15 @@ export function resolveIcqqConfig(config) {
     const qqnt = config.qqnt;
     const ntLogin = config.ntLogin;
     const notify = resolveAdapterNotifyTarget(config.notify);
+    if (config.logLevel !== undefined && !isIcqqSdkLogLevel(config.logLevel)) {
+        throw new TypeError(`ICQQ logLevel must be one of ${ICQQ_SDK_LOG_LEVELS.join(', ')}`);
+    }
+    const logLevel = config.logLevel ?? DEFAULT_ICQQ_SDK_LOG_LEVEL;
     return {
         context: 'icqq',
         id,
         autoReconnect,
+        logLevel,
         ...(outboundMedia ? { outboundMedia } : {}),
         ...(password ? { password } : {}),
         ...(platform != null ? { platform: Number(platform) } : {}),

package/lib/sdk-logger.d.ts

@@ -12,3 +12,27 @@ export interface IcqqSdkLogger {
 export declare function redactIcqqLogText(text: string): string;
 /** Wrap the SDK logger; `level` reads and writes through to the original. */
 export declare function redactingIcqqLogger<T extends IcqqSdkLogger>(original: T): T;
+/** ICQQ SDK log levels from most to least verbose (`off` silences it). */
+export declare const ICQQ_SDK_LOG_LEVELS: readonly ["trace", "debug", "info", "warn", "error", "fatal", "mark", "off"];
+export type IcqqSdkLogLevel = typeof ICQQ_SDK_LOG_LEVELS[number];
+/** Default `logLevel`: the SDK's warnings and errors, not its per-message `info` lines (#1250). */
+export declare const DEFAULT_ICQQ_SDK_LOG_LEVEL: IcqqSdkLogLevel;
+export declare function isIcqqSdkLogLevel(value: unknown): value is IcqqSdkLogLevel;
+/** The part of a Zhin logger the SDK bridge writes to. */
+export interface IcqqSdkLogTarget {
+    debug(message: string): unknown;
+    info(message: string): unknown;
+    warn(message: string): unknown;
+    error(message: string): unknown;
+}
+/**
+ * Replaces the SDK's log4js logger with one that writes through the Zhin logger (#1250): one log
+ * format, the Zhin logger's colour handling (no ANSI when the output is not a terminal), and
+ * - `level` (the SDK's `log_level`, default {@link DEFAULT_ICQQ_SDK_LOG_LEVEL}) filters first;
+ * - message dumps go to `debug`, so chat text is not written to disk at the default level;
+ * - links and phone numbers are redacted ({@link redactIcqqLogText}), line breaks and control
+ *   characters escaped and the line capped ({@link truncatePreview}), so a multi-line message
+ *   cannot forge log lines.
+ */
+export declare function bridgeIcqqSdkLogger(target: IcqqSdkLogTarget, level?: IcqqSdkLogLevel): IcqqSdkLogger;
+export declare function isBridgedIcqqSdkLogger(value: unknown): boolean;

package/lib/sdk-logger.js

@@ -9,6 +9,8 @@
  * Not covered (SDK code that bypasses its logger): the terminal QR code drawing and the
  * `console.log(proto.toJSON())` of the legacy 237 branch; see the README "登录" section.
  */
+import { inspect } from 'node:util';
+import { LOG_CONTENT_MAX_LENGTH, truncatePreview } from '@zhin.js/logger';
 const LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark'];
 const REDACTED = Symbol('icqq.redacted-logger');
 /** Links keep scheme, host and path; query and fragment become `…`. Phone numbers become `***`. */
@@ -42,3 +44,74 @@ export function redactingIcqqLogger(original) {
     Object.defineProperty(wrapper, REDACTED, { value: true });
     return wrapper;
 }
+/** ICQQ SDK log levels from most to least verbose (`off` silences it). */
+export const ICQQ_SDK_LOG_LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark', 'off'];
+/** Default `logLevel`: the SDK's warnings and errors, not its per-message `info` lines (#1250). */
+export const DEFAULT_ICQQ_SDK_LOG_LEVEL = 'warn';
+export function isIcqqSdkLogLevel(value) {
+    return typeof value === 'string' && ICQQ_SDK_LOG_LEVELS.includes(value);
+}
+/**
+ * The SDK's per-message lines (`recv from: [Group: …] <full text>`, `succeed to send: […] …`) carry
+ * chat content: they are logged at `debug`, whatever level the SDK used.
+ */
+const MESSAGE_DUMP = /^\s*(?:recv from|succeed to send|send to)\b/iu;
+/** Longest SDK diagnostic kept on one line (message dumps use the shorter content cap). */
+const SDK_LINE_MAX_LENGTH = 2000;
+function sdkArgText(value) {
+    if (typeof value === 'string')
+        return value;
+    if (value instanceof Error)
+        return value.stack ?? value.message;
+    try {
+        return inspect(value, { depth: 3, breakLength: Infinity });
+    }
+    catch {
+        return String(value);
+    }
+}
+const BRIDGED = Symbol('icqq.bridged-logger');
+/**
+ * Replaces the SDK's log4js logger with one that writes through the Zhin logger (#1250): one log
+ * format, the Zhin logger's colour handling (no ANSI when the output is not a terminal), and
+ * - `level` (the SDK's `log_level`, default {@link DEFAULT_ICQQ_SDK_LOG_LEVEL}) filters first;
+ * - message dumps go to `debug`, so chat text is not written to disk at the default level;
+ * - links and phone numbers are redacted ({@link redactIcqqLogText}), line breaks and control
+ *   characters escaped and the line capped ({@link truncatePreview}), so a multi-line message
+ *   cannot forge log lines.
+ */
+export function bridgeIcqqSdkLogger(target, level = DEFAULT_ICQQ_SDK_LOG_LEVEL) {
+    let current = level;
+    const enabled = (at) => current !== 'off' && at >= ICQQ_SDK_LOG_LEVELS.indexOf(current);
+    const bridge = Object.create(null);
+    for (const sdkLevel of LEVELS) {
+        bridge[sdkLevel] = (...args) => {
+            const text = redactIcqqLogText(args.map(sdkArgText).join(' '));
+            const dump = MESSAGE_DUMP.test(text);
+            if (!enabled(dump ? ICQQ_SDK_LOG_LEVELS.indexOf('debug') : ICQQ_SDK_LOG_LEVELS.indexOf(sdkLevel)))
+                return;
+            const line = truncatePreview(text, dump ? LOG_CONTENT_MAX_LENGTH : SDK_LINE_MAX_LENGTH);
+            if (dump || sdkLevel === 'trace' || sdkLevel === 'debug')
+                target.debug(line);
+            else if (sdkLevel === 'info' || sdkLevel === 'mark')
+                target.info(line);
+            else if (sdkLevel === 'warn')
+                target.warn(line);
+            else
+                target.error(line);
+        };
+    }
+    Object.defineProperty(bridge, 'level', {
+        get: () => current,
+        // `client.log_level = …` writes here; an unknown value keeps the current level.
+        set: (value) => { if (isIcqqSdkLogLevel(value))
+            current = value; },
+        enumerable: true,
+    });
+    Object.defineProperty(bridge, BRIDGED, { value: true });
+    Object.defineProperty(bridge, REDACTED, { value: true });
+    return bridge;
+}
+export function isBridgedIcqqSdkLogger(value) {
+    return Boolean(value && typeof value === 'object' && value[BRIDGED]);
+}

package/package.json

@@ -1,7 +1,17 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.29",
-  "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
+  "version": "1.2.0",
+  "description": "ICQQ adapter: in-process @icqqjs/icqq client for QQ groups, private chats, temporary sessions and guild channels.",
+  "keywords": [
+    "zhin.js",
+    "icqq",
+    "qq",
+    "tencent"
+  ],
+  "author": {
+    "name": "lc-cn",
+    "url": "https://github.com/zhinjs/zhin"
+  },
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -11,21 +21,6 @@
       "import": "./lib/index.js"
     }
   },
-  "keywords": [
-    "zhin",
-    "zhin.js",
-    "bot",
-    "adapter",
-    "icqq",
-    "qq",
-    "tencent",
-    "chatbot"
-  ],
-  "author": {
-    "name": "lc-cn",
-    "email": "admin@liucl.cn",
-    "url": "https://github.com/lc-cn"
-  },
   "license": "MIT",
   "repository": {
     "url": "git+https://github.com/zhinjs/zhin.git",
@@ -34,27 +29,27 @@
   },
   "dependencies": {
     "zod": "^4.6.7",
-    "@zhin.js/adapter": "1.1.34",
-    "@zhin.js/agent-feature": "1.1.18",
-    "@zhin.js/adapter-onebot-events": "0.0.8",
-    "@zhin.js/core": "1.7.0",
-    "@zhin.js/console-contract": "1.1.6",
-    "@zhin.js/im-contract": "1.1.14",
-    "@zhin.js/feature-kit": "1.1.17",
-    "@zhin.js/logger": "1.1.3",
-    "@zhin.js/page": "1.1.19",
-    "@zhin.js/tool": "1.1.20",
-    "@zhin.js/skill": "1.1.18",
-    "@zhin.js/permission": "1.2.1"
+    "@zhin.js/adapter": "1.3.1",
+    "@zhin.js/adapter-onebot-events": "0.0.10",
+    "@zhin.js/agent-feature": "1.1.19",
+    "@zhin.js/console-contract": "1.2.0",
+    "@zhin.js/core": "1.9.0",
+    "@zhin.js/feature-kit": "1.1.18",
+    "@zhin.js/im-contract": "1.2.0",
+    "@zhin.js/logger": "1.2.0",
+    "@zhin.js/page": "1.1.20",
+    "@zhin.js/permission": "1.2.2",
+    "@zhin.js/skill": "1.1.19",
+    "@zhin.js/tool": "1.1.21"
   },
   "peerDependencies": {
     "@icqqjs/icqq": "^1.12.2",
-    "@zhin.js/adapter": "^1.1.34",
-    "@zhin.js/agent": "^1.3.1",
-    "@zhin.js/command": "^1.2.2",
-    "@zhin.js/core": "^1.7.0",
-    "zhin.js": "^1.2.0",
-    "@zhin.js/prompt-section": "^1.1.17"
+    "@zhin.js/adapter": "^1.3.1",
+    "@zhin.js/agent": "^1.5.0",
+    "@zhin.js/command": "^1.3.0",
+    "@zhin.js/core": "^1.9.0",
+    "@zhin.js/prompt-section": "^1.1.18",
+    "zhin.js": "^1.4.0"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
@@ -78,9 +73,9 @@
     "@types/node": "^26.1.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@zhin.js/prompt-section": "1.1.17",
-    "zhin.js": "1.2.0",
-    "@zhin.js/agent": "1.3.1"
+    "@zhin.js/agent": "1.5.0",
+    "@zhin.js/prompt-section": "1.1.18",
+    "zhin.js": "1.4.0"
   },
   "files": [
     "adapters",
@@ -140,7 +135,19 @@
         "optional": true
       }
     ],
-    "plugins": []
+    "plugins": [],
+    "metadata": {
+      "displayName": "ICQQ Adapter",
+      "displayNameI18n": {
+        "zh-CN": "ICQQ 适配器",
+        "en": "ICQQ Adapter"
+      },
+      "descriptionI18n": {
+        "zh-CN": "ICQQ 适配器：进程内直连 @icqqjs/icqq，支持 QQ 群聊、私聊、临时会话与频道消息。",
+        "en": "ICQQ adapter: in-process @icqqjs/icqq client for QQ groups, private chats, temporary sessions and guild channels."
+      },
+      "category": "adapter"
+    }
   },
   "scripts": {
     "build": "tsc",

package/plugin.js

@@ -6,9 +6,6 @@ import { icqqSensitiveExecRule } from "./lib/sensitive-commands.js";
 export default definePlugin({
     name: 'icqq',
     configUpdate: { featurePaths: [['nickname'], ['profile'], ['endpoints']] },
-    metadata: {
-        displayName: 'ICQQ Adapter',
-    },
     setup(context) {
         const disposeExecRule = registerSensitiveExecCommand(icqqSensitiveExecRule);
         return {

package/schema.json

@@ -141,6 +141,26 @@
         }
       }
     },
+    "logLevel": {
+      "type": "string",
+      "enum": [
+        "trace",
+        "debug",
+        "info",
+        "warn",
+        "error",
+        "fatal",
+        "mark",
+        "off"
+      ],
+      "default": "warn",
+      "description": "ICQQ SDK 自身日志的级别（默认 warn）；它逐条打印的收发消息原文（recv from / succeed to send）只在 debug 及以下出现，且转义为单行",
+      "x-i18n": {
+        "en": {
+          "description": "Level of the ICQQ SDK's own log lines (default warn). Its per-message lines with the message text (recv from / succeed to send) only appear at debug or below, escaped onto one line."
+        }
+      }
+    },
     "endpoints": {
       "type": "array",
       "minItems": 1,
@@ -284,6 +304,25 @@
               }
             }
           },
+          "logLevel": {
+            "type": "string",
+            "enum": [
+              "trace",
+              "debug",
+              "info",
+              "warn",
+              "error",
+              "fatal",
+              "mark",
+              "off"
+            ],
+            "description": "ICQQ SDK 自身日志的级别",
+            "x-i18n": {
+              "en": {
+                "description": "Level of the ICQQ SDK's own log lines."
+              }
+            }
+          },
           "commandPrefix": {
             "type": "string",
             "description": "本 endpoint 的命令前缀",

package/src/adapter.ts

@@ -10,7 +10,7 @@ import type { IcqqClientEventMap } from './client.js';
 export class IcqqAdapter extends Adapter<IcqqEndpoint, IcqqEndpointConfig, IcqqClientEventMap> {
   override get configurationIdentityFields(): readonly string[] { return ['id']; }
   override get configurationUpdateFields(): readonly string[] {
-    return ['password', 'platform', 'ver', 'dataDir', 'signApiAddr', 'autoReconnect', 'autoServer', 'qqnt', 'ntLogin'];
+    return ['password', 'platform', 'ver', 'dataDir', 'signApiAddr', 'autoReconnect', 'autoServer', 'qqnt', 'ntLogin', 'logLevel'];
   }
   readonly #context: AdapterContext<IcqqEndpointConfig>;
   constructor(context: AdapterContext<IcqqEndpointConfig>) { super(); this.#context = context; }

package/src/endpoint.ts

@@ -41,7 +41,7 @@ import type { CapabilityId } from 'zhin.js';
 import type { IcqqLoginControl } from './icqq-login-control.js';
 import { IcqqLoginDriver, icqqLinkHost, type IcqqChallengeKind } from './icqq-login-assist.js';
 import { messages as t } from './i18n.js';
-import { redactingIcqqLogger, type IcqqSdkLogger } from './sdk-logger.js';
+import { bridgeIcqqSdkLogger } from './sdk-logger.js';
 import { sanitizeIcqqLoginMessage } from './icqq-login-errors.js';
 import { IcqqContentResolver } from './content-resolver.js';
 import {
@@ -116,6 +116,15 @@ const BOUND_EVENTS = [
   'system.login.auth',
 ] as const;
 
+/**
+ * Log level of an ICQQ `system.*` event by meaning: coming online and login challenges waiting for
+ * the person (QR code, device lock, slider, identity check) are normal progress (`info`); only
+ * failures (login errors, going offline) are `warn`, so a routine login stays out of the warnings.
+ */
+export function icqqSystemEventLogLevel(type: string): 'info' | 'warn' {
+  return type === 'online' || type.startsWith('login.') && type !== 'login.error' ? 'info' : 'warn';
+}
+
 export class IcqqEndpoint extends ManagedIcqqClient implements Endpoint {
   readonly [endpointSpec]: EndpointSpecification;
   readonly #logger: ReturnType<typeof getAdapterLogger>;
@@ -266,11 +275,13 @@ export class IcqqEndpoint extends ManagedIcqqClient implements Endpoint {
         },
       },
     });
-    // The SDK logs verification links (sid / sig) and the phone at `mark` level: redact them.
-    if (this.logger) this.logger = redactingIcqqLogger(this.logger as IcqqSdkLogger) as typeof this.logger;
+    this.#logger = getAdapterLogger('icqq', options.config.id);
+    // The SDK's own log4js output is replaced by a bridge into this Zhin logger (#1250): one format,
+    // no ANSI off a terminal, `logLevel` (default warn), chat text only at debug and escaped onto one
+    // line, verification links (sid / sig) and phone numbers redacted.
+    if (this.logger) this.logger = bridgeIcqqSdkLogger(this.#logger, options.config.logLevel) as unknown as typeof this.logger;
     this.#contentResolver = new IcqqContentResolver(this);
     this.#content = this.#contentResolver.port;
-    this.#logger = getAdapterLogger('icqq', options.config.id);
     this.#options = options;
     this.endpointName = options.config.id;
     this.#login = new IcqqLoginDriver({
@@ -1032,7 +1043,7 @@ export class IcqqEndpoint extends ManagedIcqqClient implements Endpoint {
   #logSystemEvent(type: string, event: unknown, safe?: Record<string, unknown> | null): void {
     const payload = safe === undefined ? serializeIcqqEvent(event) : safe;
     const line = payload;
-    this.#logger.warn(formatCompact({
+    this.#logger[icqqSystemEventLogLevel(type)](formatCompact({
       op: `system.${type}`,
       endpoint: this.endpointName,
       ...(line ? { event: JSON.stringify(line) } : {}),
@@ -1434,7 +1445,7 @@ function resolveIcqqGroupReactionTarget(
 
 function resolveNativeClientConfig(config: ResolvedIcqqConfig): NativeIcqqClientConfig {
   return {
-    log_level: 'info',
+    log_level: config.logLevel,
     platform: config.platform,
     ...(config.ver ? { ver: config.ver } : {}),
     ...(config.dataDir ? { data_dir: config.dataDir } : {}),

package/src/protocol.ts

@@ -4,6 +4,7 @@ import { isMediaRef, type ConversationRef, type PlatformStanding } from '@zhin.j
 import { resolveAdapterNotifyTarget, type AdapterNotifyTarget, type ResolvedAdapterNotifyTarget } from 'zhin.js/adapter';
 import type { MessageSegment, SendContent } from "zhin.js";
 import { resolveIcqqMediaFile } from "./cq-message.js";
+import { DEFAULT_ICQQ_SDK_LOG_LEVEL, ICQQ_SDK_LOG_LEVELS, isIcqqSdkLogLevel, type IcqqSdkLogLevel } from "./sdk-logger.js";
 
 export type ActionResult = {
   id: string;
@@ -248,6 +249,8 @@ export interface IcqqEndpointConfig extends EndpointProfileConfiguration {
   readonly autoServer?: boolean;
   readonly qqnt?: boolean;
   readonly ntLogin?: boolean;
+  /** Level of the ICQQ SDK's own log lines (default `warn`; its per-message lines are `debug`). */
+  readonly logLevel?: IcqqSdkLogLevel;
   /** Optional out-of-band outage notification target (usually a QQ adapter instance). */
   readonly notify?: AdapterNotifyTarget;
 }
@@ -268,6 +271,7 @@ export interface ResolvedIcqqConfig {
   readonly autoServer?: boolean;
   readonly qqnt?: boolean;
   readonly ntLogin?: boolean;
+  readonly logLevel: IcqqSdkLogLevel;
   readonly notify?: ResolvedAdapterNotifyTarget;
 }
 
@@ -321,10 +325,15 @@ export function resolveIcqqConfig(config: IcqqEndpointConfig): ResolvedIcqqConfi
   const qqnt = config.qqnt;
   const ntLogin = config.ntLogin;
   const notify = resolveAdapterNotifyTarget(config.notify);
+  if (config.logLevel !== undefined && !isIcqqSdkLogLevel(config.logLevel)) {
+    throw new TypeError(`ICQQ logLevel must be one of ${ICQQ_SDK_LOG_LEVELS.join(', ')}`);
+  }
+  const logLevel = config.logLevel ?? DEFAULT_ICQQ_SDK_LOG_LEVEL;
   return {
     context: 'icqq',
     id,
     autoReconnect,
+    logLevel,
     ...(outboundMedia ? { outboundMedia } : {}),
     ...(password ? { password } : {}),
     ...(platform != null ? { platform: Number(platform) } : {}),

package/src/sdk-logger.ts

@@ -9,6 +9,9 @@
  * Not covered (SDK code that bypasses its logger): the terminal QR code drawing and the
  * `console.log(proto.toJSON())` of the legacy 237 branch; see the README "登录" section.
  */
+import { inspect } from 'node:util';
+import { LOG_CONTENT_MAX_LENGTH, truncatePreview } from '@zhin.js/logger';
+
 const LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark'] as const;
 type Level = typeof LEVELS[number];
 const REDACTED = Symbol('icqq.redacted-logger');
@@ -55,3 +58,81 @@ export function redactingIcqqLogger<T extends IcqqSdkLogger>(original: T): T {
   return wrapper as unknown as T;
 }
 
+
+/** ICQQ SDK log levels from most to least verbose (`off` silences it). */
+export const ICQQ_SDK_LOG_LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark', 'off'] as const;
+export type IcqqSdkLogLevel = typeof ICQQ_SDK_LOG_LEVELS[number];
+/** Default `logLevel`: the SDK's warnings and errors, not its per-message `info` lines (#1250). */
+export const DEFAULT_ICQQ_SDK_LOG_LEVEL: IcqqSdkLogLevel = 'warn';
+
+export function isIcqqSdkLogLevel(value: unknown): value is IcqqSdkLogLevel {
+  return typeof value === 'string' && (ICQQ_SDK_LOG_LEVELS as readonly string[]).includes(value);
+}
+
+/** The part of a Zhin logger the SDK bridge writes to. */
+export interface IcqqSdkLogTarget {
+  debug(message: string): unknown;
+  info(message: string): unknown;
+  warn(message: string): unknown;
+  error(message: string): unknown;
+}
+
+/**
+ * The SDK's per-message lines (`recv from: [Group: …] <full text>`, `succeed to send: […] …`) carry
+ * chat content: they are logged at `debug`, whatever level the SDK used.
+ */
+const MESSAGE_DUMP = /^\s*(?:recv from|succeed to send|send to)\b/iu;
+/** Longest SDK diagnostic kept on one line (message dumps use the shorter content cap). */
+const SDK_LINE_MAX_LENGTH = 2000;
+
+function sdkArgText(value: unknown): string {
+  if (typeof value === 'string') return value;
+  if (value instanceof Error) return value.stack ?? value.message;
+  try {
+    return inspect(value, { depth: 3, breakLength: Infinity });
+  } catch {
+    return String(value);
+  }
+}
+
+const BRIDGED = Symbol('icqq.bridged-logger');
+
+/**
+ * Replaces the SDK's log4js logger with one that writes through the Zhin logger (#1250): one log
+ * format, the Zhin logger's colour handling (no ANSI when the output is not a terminal), and
+ * - `level` (the SDK's `log_level`, default {@link DEFAULT_ICQQ_SDK_LOG_LEVEL}) filters first;
+ * - message dumps go to `debug`, so chat text is not written to disk at the default level;
+ * - links and phone numbers are redacted ({@link redactIcqqLogText}), line breaks and control
+ *   characters escaped and the line capped ({@link truncatePreview}), so a multi-line message
+ *   cannot forge log lines.
+ */
+export function bridgeIcqqSdkLogger(target: IcqqSdkLogTarget, level: IcqqSdkLogLevel = DEFAULT_ICQQ_SDK_LOG_LEVEL): IcqqSdkLogger {
+  let current: IcqqSdkLogLevel = level;
+  const enabled = (at: number): boolean => current !== 'off' && at >= ICQQ_SDK_LOG_LEVELS.indexOf(current);
+  const bridge = Object.create(null) as Record<Level, (...args: unknown[]) => void>;
+  for (const sdkLevel of LEVELS) {
+    bridge[sdkLevel] = (...args: unknown[]) => {
+      const text = redactIcqqLogText(args.map(sdkArgText).join(' '));
+      const dump = MESSAGE_DUMP.test(text);
+      if (!enabled(dump ? ICQQ_SDK_LOG_LEVELS.indexOf('debug') : ICQQ_SDK_LOG_LEVELS.indexOf(sdkLevel))) return;
+      const line = truncatePreview(text, dump ? LOG_CONTENT_MAX_LENGTH : SDK_LINE_MAX_LENGTH);
+      if (dump || sdkLevel === 'trace' || sdkLevel === 'debug') target.debug(line);
+      else if (sdkLevel === 'info' || sdkLevel === 'mark') target.info(line);
+      else if (sdkLevel === 'warn') target.warn(line);
+      else target.error(line);
+    };
+  }
+  Object.defineProperty(bridge, 'level', {
+    get: () => current,
+    // `client.log_level = …` writes here; an unknown value keeps the current level.
+    set: (value: unknown) => { if (isIcqqSdkLogLevel(value)) current = value; },
+    enumerable: true,
+  });
+  Object.defineProperty(bridge, BRIDGED, { value: true });
+  Object.defineProperty(bridge, REDACTED, { value: true });
+  return bridge as unknown as IcqqSdkLogger;
+}
+
+export function isBridgedIcqqSdkLogger(value: unknown): boolean {
+  return Boolean(value && typeof value === 'object' && (value as { [BRIDGED]?: true })[BRIDGED]);
+}