@zhin.js/adapter-icqq 1.1.22 → 1.1.24

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @zhin.js/adapter-icqq
 
+## 1.1.24
+
+### Patch Changes
+
+- cbf1fb1: Unify Console page blueprints (`definePageBlueprint`, `defineAdapterPage`, `defineCommentReviewPage`, `projectBlueprintToImCard`, `projectBlueprintToCliPanel`) into `@zhin.js/console-contract` and `@zhin.js/page`, add zero-esbuild pure Blueprint synthesis + static client bundle mounting to `@zhin.js/pagemanager`, remove `@zhin.js/client` (React 19) and `.tsx` from all 30 server-side plugins and adapters (including `bilibili` and `juejin`), and remove legacy Era-1 Koa `PageManager` code.
+- Updated dependencies [cbf1fb1]
+- Updated dependencies [008ccad]
+- Updated dependencies [a1f1028]
+  - @zhin.js/console-contract@1.1.4
+  - @zhin.js/page@1.1.16
+  - @zhin.js/core@1.1.58
+  - @zhin.js/im-contract@1.1.13
+  - @zhin.js/adapter@1.1.30
+  - @zhin.js/adapter-onebot-events@0.0.3
+  - @zhin.js/tool@1.1.17
+  - @zhin.js/agent-feature@1.1.15
+  - @zhin.js/feature-kit@1.1.14
+  - @zhin.js/permission@1.1.14
+  - @zhin.js/skill@1.1.15
+
+## 1.1.23
+
+### Patch Changes
+
+- bc6ccb1: Deep audit bug fixes and 7 architectural improvements:
+  - Sink Agent Turn ingress pipeline from `@zhin.js/cli` into `@zhin.js/agent/runtime` (`plugin-runtime/ingress/`) and decompose `ingress-route.ts` into modular pipeline stages.
+  - Bind Session State Plane (`JsxButtonRegistry`, `InteractionRuntime`, `RuntimeInteractiveRouter`) to `PluginIncarnationRef` so active buttons and interactions survive unrelated-plugin HMR while expiring when the owning plugin reloads, and support per-conversation fallback numbering (`numberingScope: 'conversation'`).
+  - Establish `conversation_events` as the canonical message SSOT and reference `conversation_event_id`, `conversation_key`, `platform_message_id`, and `message_key` in `agent_messages` (`AGENT_MESSAGE_QUERY_VERSION = 2`), threading `conversationSequence` across inbound and outbound delivery receipts.
+  - Push down `DatabaseContextRepository` and `DatabaseScheduleJobStorage` full-session/full-table memory scans to indexed SQL queries.
+  - Add kernel-level inbound `replyTo` and `mentioned` auto-promotion (`promoteInboundMessagePayload`) plus reusable `InboundDeduper` and `TtlLookupCache` primitives in `@zhin.js/adapter`.
+  - Add `MiddlewareContext.dispatch` (`InboundDispatchSummary`) and `onAfterDispatch` hooks for `after-dispatch` middlewares, and support incremental rendering of in-place `envelope.payload` array mutations in `OutboundDeliveryRuntime`.
+  - Unify `HistoryWindowTracker` and `AgentCompactionRuntime` token/message budgets (`resolveUnifiedHistoryAndCompactionBudget`).
+  - Fix schema validation, database transaction connection cleanup and SQLite WAL mode, schedule timer wheel head-of-line blocking, security policy bash read paths and subagent guard propagation, group merge window permission carrier handoff, micro-compact namespaced tool matching, and WebSocket force-close / inbound segment mapping across adapters.
+- Updated dependencies [3a8504b]
+- Updated dependencies [6163abc]
+- Updated dependencies [fed2c27]
+- Updated dependencies [bc6ccb1]
+- Updated dependencies [72b5a12]
+- Updated dependencies [4427e72]
+- Updated dependencies [22bd14a]
+  - @zhin.js/agent-feature@1.1.14
+  - @zhin.js/core@1.1.57
+  - @zhin.js/client@1.1.25
+  - @zhin.js/page@1.1.15
+  - @zhin.js/im-contract@1.1.12
+  - @zhin.js/adapter@1.1.29
+  - @zhin.js/feature-kit@1.1.13
+  - @zhin.js/tool@1.1.16
+  - @zhin.js/adapter-onebot-events@0.0.2
+  - @zhin.js/permission@1.1.13
+  - @zhin.js/skill@1.1.14
+
 ## 1.1.22
 
 ### Patch Changes

package/lib/icqq-inbound.d.ts

@@ -2,6 +2,7 @@
  * icqq 入站事件归一化（post_type / message_type / message 段）
  */
 import { type MessageSegment } from "zhin.js";
+import { InboundMessageDeduper } from "zhin.js/adapter";
 import type { GroupRole } from "./types.js";
 /** 守护进程推送的通用事件壳 */
 export interface IcqqEventBase {
@@ -163,9 +164,4 @@ export declare function resolveIcqqQuoteIdFromEvent(data: IcqqMessageEvent): str
 export declare function resolveInboundContent(data: IcqqMessageEvent): MessageSegment[];
 export declare function normalizeIcqqInboundMessage(data: IcqqMessageEvent): NormalizedIcqqInbound | null;
 /** 按 message_id 去重（多路 subscribe 会收到同一消息多次） */
-export declare class InboundMessageDeduper {
-    private readonly seen;
-    shouldProcess(messageId: string): boolean;
-    clear(): void;
-}
-export {};
+export { InboundMessageDeduper };

package/lib/icqq-inbound.js

@@ -2,6 +2,7 @@
  * icqq 入站事件归一化（post_type / message_type / message 段）
  */
 import { toCanonicalSegments } from "zhin.js";
+import { InboundMessageDeduper, promoteInboundMessagePayload } from "zhin.js/adapter";
 import { parseCqMessage, icqqMediaRefFromString } from "./cq-message.js";
 import { extractForwardResidFromJsonElement } from "./forward-msg.js";
 /**
@@ -32,7 +33,6 @@ export async function resolveIcqqInboundMedia(elements, resolver) {
         }
     }));
 }
-const DEDUPE_TTL_MS = 120_000;
 const ICQQ_GROUP_ROLES = new Set(["owner", "admin", "member"]);
 /** 从 sender.role 解析群成员角色（供 Message.$sender → resolveSenderRoles） */
 export function parseIcqqSenderGroupRole(sender) {
@@ -51,14 +51,8 @@ export function isIcqqBotMentioned(input) {
     const uin = String(input.uin ?? "").trim();
     if (!uin)
         return false;
-    for (const seg of input.content ?? []) {
-        if (!seg || (seg.type !== "at" && seg.type !== "mention"))
-            continue;
-        const data = (seg.data ?? {});
-        const target = String(data.qq ?? data.user_id ?? data.id ?? data.target ?? "").trim();
-        if (target && target !== "all" && Number(target) === Number(uin)) {
-            return true;
-        }
+    if (promoteInboundMessagePayload({ segments: input.content ?? [] }, uin).mentioned === true) {
+        return true;
     }
     const raw = input.rawMessage ?? "";
     if (!raw)
@@ -648,10 +642,7 @@ function mergeReplyFromSource(content, data) {
     ];
 }
 function quoteIdFromSegments(content) {
-    const reply = content.find((item) => item.type === 'reply');
-    const data = reply?.data;
-    const value = data?.message_id ?? data?.id;
-    return value == null || !String(value).trim() ? undefined : String(value).trim();
+    return promoteInboundMessagePayload({ segments: content }, undefined).replyTo?.id;
 }
 export function resolveInboundContent(data) {
     const fromElements = icqqElementsToSegments(data.message);
@@ -701,20 +692,4 @@ export function normalizeIcqqInboundMessage(data) {
     };
 }
 /** 按 message_id 去重（多路 subscribe 会收到同一消息多次） */
-export class InboundMessageDeduper {
-    seen = new Map();
-    shouldProcess(messageId) {
-        const now = Date.now();
-        for (const [id, t] of this.seen) {
-            if (now - t > DEDUPE_TTL_MS)
-                this.seen.delete(id);
-        }
-        if (this.seen.has(messageId))
-            return false;
-        this.seen.set(messageId, now);
-        return true;
-    }
-    clear() {
-        this.seen.clear();
-    }
-}
+export { InboundMessageDeduper };

package/lib/outbound-media.js

@@ -43,21 +43,27 @@ export function prepareIcqqOutboundMedia(content, mode = "file") {
             return seg;
         const d = data;
         const media = d.media;
-        if (!isMediaRef(media) || media.kind !== "base64")
-            return seg;
-        const b64 = media.value.replace(/^base64:\/\//, "");
+        let b64 = "";
+        let mime = "";
+        if (isMediaRef(media) && media.kind === "base64") {
+            b64 = media.value.replace(/^base64:\/\//, "");
+            mime = media.mime_type ?? "";
+        }
+        else if (typeof d.file === "string" && d.file.startsWith("base64://")) {
+            b64 = d.file.slice("base64://".length);
+        }
         if (!b64)
             return seg;
         if (type !== "image" && type !== "record" && type !== "audio" && type !== "video") {
             return seg;
         }
-        const mime = media.mime_type ?? "";
         const filePath = spoolBase64ToFile(b64, mime || (type === "image" ? "image/jpeg" : type === "video" ? "video/mp4" : "audio/mpeg"), type === "record" || type === "audio" ? "audio" : type);
         createdFiles.push(filePath);
         return {
             type,
             data: {
                 ...d,
+                ...(typeof d.file === "string" && d.file.startsWith("base64://") ? { file: filePath } : {}),
                 media: {
                     kind: "path",
                     value: filePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.22",
+  "version": "1.1.24",
   "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,29 +33,28 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter-onebot-events": "0.0.1",
-    "@zhin.js/adapter": "1.1.28",
-    "@zhin.js/agent-feature": "1.1.13",
-    "@zhin.js/client": "1.1.24",
-    "@zhin.js/console-contract": "1.1.3",
-    "@zhin.js/core": "1.1.56",
-    "@zhin.js/feature-kit": "1.1.12",
-    "@zhin.js/im-contract": "1.1.11",
+    "@zhin.js/adapter-onebot-events": "0.0.3",
+    "@zhin.js/adapter": "1.1.30",
+    "@zhin.js/agent-feature": "1.1.15",
+    "@zhin.js/console-contract": "1.1.4",
+    "@zhin.js/core": "1.1.58",
+    "@zhin.js/feature-kit": "1.1.14",
+    "@zhin.js/im-contract": "1.1.13",
     "@zhin.js/logger": "1.1.2",
-    "@zhin.js/page": "1.1.14",
-    "@zhin.js/permission": "1.1.12",
-    "@zhin.js/skill": "1.1.13",
-    "@zhin.js/tool": "1.1.15"
+    "@zhin.js/page": "1.1.16",
+    "@zhin.js/permission": "1.1.14",
+    "@zhin.js/skill": "1.1.15",
+    "@zhin.js/tool": "1.1.17"
   },
   "peerDependencies": {
     "@icqqjs/icqq": "^1.12.2",
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.28",
-    "@zhin.js/agent": "^1.1.47",
-    "@zhin.js/command": "^1.1.14",
-    "@zhin.js/core": "^1.1.56",
-    "@zhin.js/prompt-section": "^1.1.12",
-    "zhin.js": "^1.1.21"
+    "@zhin.js/adapter": "^1.1.30",
+    "@zhin.js/agent": "^1.1.49",
+    "@zhin.js/command": "^1.1.16",
+    "@zhin.js/core": "^1.1.58",
+    "@zhin.js/prompt-section": "^1.1.14",
+    "zhin.js": "^1.1.23"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
@@ -83,9 +82,9 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.47",
-    "@zhin.js/prompt-section": "1.1.12",
-    "zhin.js": "1.1.21"
+    "@zhin.js/agent": "1.1.49",
+    "@zhin.js/prompt-section": "1.1.14",
+    "zhin.js": "1.1.23"
   },
   "files": [
     "adapters",

package/pages/index/index.js

@@ -1,6 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePage } from '@zhin.js/console-contract';
-import { createAdapterConsolePage } from '@zhin.js/client';
+import { definePage, createAdapterConsolePage } from '@zhin.js/console-contract';
 export const meta = definePage({
     title: 'ICQQ',
     titleI18n: { en: 'ICQQ' },

package/pages/index/index.ts

@@ -1,5 +1,4 @@
-import { definePage } from '@zhin.js/console-contract';
-import { createAdapterConsolePage } from '@zhin.js/client';
+import { definePage, createAdapterConsolePage } from '@zhin.js/console-contract';
 
 export const meta = definePage({
   title: 'ICQQ',

package/plugin.js

@@ -1,5 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePlugin, pluginConsoleRpcToken } from 'zhin.js';
+import { definePlugin } from 'zhin.js';
 import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { registerSensitiveExecCommand } from '@zhin.js/agent';
 import { createIcqqConsoleRpc } from "./lib/console.js";
@@ -11,14 +11,16 @@ export default definePlugin({
         displayName: 'ICQQ Adapter',
     },
     setup(context) {
-        context.resources.provide(pluginConsoleRpcToken, createIcqqConsoleRpc(() => context.config.get()));
         const disposePlatform = context.resources.has(permissionHostToken)
             ? context.resources.use(permissionHostToken).registerPlatform('icqq', createSceneRolePlatformChecker())
             : undefined;
         const disposeExecRule = registerSensitiveExecCommand(icqqSensitiveExecRule);
-        return () => {
-            disposeExecRule();
-            disposePlatform?.();
+        return {
+            consoleRpc: createIcqqConsoleRpc(() => context.config.get()),
+            dispose: () => {
+                disposeExecRule();
+                disposePlatform?.();
+            },
         };
     },
 });

package/src/icqq-inbound.ts

@@ -2,6 +2,7 @@
  * icqq 入站事件归一化（post_type / message_type / message 段）
  */
 import { toCanonicalSegments, type MessageSegment } from "zhin.js";
+import { InboundMessageDeduper, promoteInboundMessagePayload } from "zhin.js/adapter";
 import { parseCqMessage, icqqMediaRefFromString } from "./cq-message.js";
 import { extractForwardResidFromJsonElement } from "./forward-msg.js";
 import type { GroupRole } from "./types.js";
@@ -141,8 +142,6 @@ export interface NormalizedIcqqInbound {
   raw: IcqqMessageEvent;
 }
 
-const DEDUPE_TTL_MS = 120_000;
-
 const ICQQ_GROUP_ROLES = new Set<GroupRole>(["owner", "admin", "member"]);
 
 /** 从 sender.role 解析群成员角色（供 Message.$sender → resolveSenderRoles） */
@@ -167,15 +166,13 @@ export function isIcqqBotMentioned(input: {
 }): boolean {
   const uin = String(input.uin ?? "").trim();
   if (!uin) return false;
-  for (const seg of input.content ?? []) {
-    if (!seg || (seg.type !== "at" && seg.type !== "mention")) continue;
-    const data = (seg.data ?? {}) as Record<string, unknown>;
-    const target = String(
-      data.qq ?? data.user_id ?? data.id ?? data.target ?? "",
-    ).trim();
-    if (target && target !== "all" && Number(target) === Number(uin)) {
-      return true;
-    }
+  if (
+    promoteInboundMessagePayload<{ segments: readonly MessageSegment[]; mentioned?: boolean }>(
+      { segments: input.content ?? [] },
+      uin,
+    ).mentioned === true
+  ) {
+    return true;
   }
   const raw = input.rawMessage ?? "";
   if (!raw) return false;
@@ -805,10 +802,10 @@ function mergeReplyFromSource(
 }
 
 function quoteIdFromSegments(content: readonly MessageSegment[]): string | undefined {
-  const reply = content.find((item) => item.type === 'reply');
-  const data = reply?.data as Readonly<Record<string, unknown>> | undefined;
-  const value = data?.message_id ?? data?.id;
-  return value == null || !String(value).trim() ? undefined : String(value).trim();
+  return promoteInboundMessagePayload<{ segments: readonly MessageSegment[]; replyTo?: { readonly id: string } }>(
+    { segments: content },
+    undefined,
+  ).replyTo?.id;
 }
 
 export function resolveInboundContent(
@@ -863,20 +860,4 @@ export function normalizeIcqqInboundMessage(
 }
 
 /** 按 message_id 去重（多路 subscribe 会收到同一消息多次） */
-export class InboundMessageDeduper {
-  private readonly seen = new Map<string, number>();
-
-  shouldProcess(messageId: string): boolean {
-    const now = Date.now();
-    for (const [id, t] of this.seen) {
-      if (now - t > DEDUPE_TTL_MS) this.seen.delete(id);
-    }
-    if (this.seen.has(messageId)) return false;
-    this.seen.set(messageId, now);
-    return true;
-  }
-
-  clear(): void {
-    this.seen.clear();
-  }
-}
+export { InboundMessageDeduper };

package/src/outbound-media.ts

@@ -68,14 +68,19 @@ export function prepareIcqqOutboundMedia(
     if (!data || typeof data !== "object") return seg;
     const d = data as Record<string, unknown>;
     const media = d.media;
-    if (!isMediaRef(media) || media.kind !== "base64") return seg;
-    const b64 = media.value.replace(/^base64:\/\//, "");
+    let b64 = "";
+    let mime = "";
+    if (isMediaRef(media) && media.kind === "base64") {
+      b64 = media.value.replace(/^base64:\/\//, "");
+      mime = media.mime_type ?? "";
+    } else if (typeof d.file === "string" && d.file.startsWith("base64://")) {
+      b64 = d.file.slice("base64://".length);
+    }
     if (!b64) return seg;
     if (type !== "image" && type !== "record" && type !== "audio" && type !== "video") {
       return seg;
     }
 
-    const mime = media.mime_type ?? "";
     const filePath = spoolBase64ToFile(
       b64,
       mime || (type === "image" ? "image/jpeg" : type === "video" ? "video/mp4" : "audio/mpeg"),
@@ -86,6 +91,7 @@ export function prepareIcqqOutboundMedia(
       type,
       data: {
         ...d,
+        ...(typeof d.file === "string" && d.file.startsWith("base64://") ? { file: filePath } : {}),
         media: {
           kind: "path",
           value: filePath,