@zhin.js/core 1.5.11 → 1.5.12

package/README.md

@@ -198,7 +198,7 @@ Core **不包含** ZhinAgent 实现。IM 侧的 AI 对话、工具收集、执
 |------|----------|
 | Provider | `AIProvider` 接口、`createSdkProviderAdapter`（AI SDK 传输） |
 | Agent 原语 | `ModelRegistry`、`agentLoop` |
-| 会话 / 上下文 | `ContextRepository`、`ImTranscriptStore`、`ContextManager`、`ConversationMemory` |
+| 会话 / 上下文 | `ConversationEventStore`（IM 事实）与 Agent 的 `ContextRepository`（模型会话） |
 | 压缩 / 限流 / 输出 | `compactSession`、`RateLimiter`、`parseOutput`、`CostTracker` |
 
 完整 Agent 能力与配置见 [`@zhin.js/agent`](../agent/README.md) 与 [AI 模块](https://zhin.js.org/advanced/ai)。
@@ -237,7 +237,7 @@ export { htmlToFallbackText, coerceHtmlSegmentsToText, registerHtmlSegmentFallba
 // AI 原语（来自 @zhin.js/ai，非 ZhinAgent）
 export {
   AIProvider, createSdkProviderAdapter, ModelRegistry,
-  ContextRepository, ContextManager, ConversationMemory, compactSession, ...
+  ContextRepository, ContextManager, compactSession, ...
 } from '@zhin.js/ai'
 ```
 

package/lib/adapter.d.ts

@@ -106,6 +106,9 @@ export declare abstract class Adapter<R extends Endpoint = Endpoint, const Caps
 }
 export interface Adapters {
 }
+/** Per-adapter live Endpoint class map for HandlerContext.$endpoint() typing. */
+export interface AdapterEndpoints {
+}
 export declare namespace Adapter {
     type Factory<R extends Adapter = Adapter> = {
         new (plugin: Plugin, name: string, config: Adapter.EndpointConfig<Adapter.InferEndpoint<R>>[]): R;

package/lib/built/ai-trigger.d.ts

@@ -37,8 +37,6 @@ export interface AITriggerConfig {
     masters?: string[];
     /** 全局 trusted（trigger 级） */
     trusted?: string[];
-    /** 是否在 AI 入参前拉取 $quote_id 对应消息正文（默认 true） */
-    resolveQuotedMessages?: boolean;
 }
 /**
  * AI 触发检查结果

package/lib/built/ai-trigger.js

@@ -26,7 +26,6 @@ export const DEFAULT_AI_TRIGGER_CONFIG = {
     errorTemplate: '❌ AI 处理失败: {error}',
     masters: [],
     trusted: [],
-    resolveQuotedMessages: true,
 };
 // ============================================================================
 // 工具函数

package/lib/built/inbound-pipeline.js

@@ -58,7 +58,6 @@ export class InboundMessagePipeline {
             recv: `${message.$channel.type}(${message.$channel.id})`,
             endpoint: message.$endpoint,
             preview: truncatePreview(segment.raw(message.$content)),
-            ...(message.$quote_id ? { quote_id: message.$quote_id } : {}),
         }));
     }
 }

package/lib/built/inbound-runner.js

@@ -1,7 +1,6 @@
 /**
  * Inbound runner — one ordered entry for IM message.receive processing.
  */
-import { Message } from '../message.js';
 function getDispatcher(plugin) {
     const dispatcher = plugin?.inject('dispatcher');
     if (dispatcher && typeof dispatcher.dispatch === 'function') {
@@ -19,7 +18,6 @@ function getDispatcher(plugin) {
  */
 export async function runInboundMessage(options) {
     const { plugin, message, emitAdapterObservers } = options;
-    Message.syncQuoteId(message);
     const dispatcher = getDispatcher(plugin);
     const root = plugin?.root;
     if (dispatcher && root) {

package/lib/built/login-assist.d.ts

@@ -9,7 +9,6 @@
  *   endpoint.login.pending — 有新待办时触发，payload: PendingLoginTask
  *   endpoint.login.expired — 超时自动取消时触发，payload: PendingLoginTask
  */
-import type { Plugin } from '../plugin.js';
 export type LoginAssistType = 'qrcode' | 'sms' | 'slider' | 'device' | 'auth' | 'other';
 /** 默认 5 分钟；扫码/滑块长期挂起会泄漏 Promise 与 Map 条目 */
 export declare const DEFAULT_LOGIN_ASSIST_TIMEOUT_MS: number;
@@ -34,26 +33,40 @@ export interface PendingLoginTask {
     expiresAt?: number;
 }
 export interface WaitForInputOptions {
+    /** Endpoint-instance owner. Only this owner may cancel the task during rollback/retirement. */
+    owner: object;
     /**
      * 超时毫秒。默认 {@link DEFAULT_LOGIN_ASSIST_TIMEOUT_MS}。
      * 传 `0` / `Infinity` / 负数表示不超时（仅测试或显式长驻场景）。
      */
     timeoutMs?: number;
 }
+export type LoginAssistEventName = 'endpoint.login.pending' | 'endpoint.login.resolved' | 'endpoint.login.expired';
+/** Minimal bus — Plugin Runtime / classic Plugin / test EventEmitter all qualify. */
+export interface LoginAssistBus {
+    emit(name: LoginAssistEventName, task: PendingLoginTask): void;
+}
 export declare class LoginAssist {
-    private readonly plugin;
+    #private;
+    private readonly bus;
     private readonly pending;
+    private readonly local;
     private idSeq;
     /** 构造时默认超时；可被 waitForInput options 覆盖 */
     private readonly defaultTimeoutMs;
-    constructor(plugin: Plugin, options?: {
+    constructor(bus?: LoginAssistBus | null, options?: {
         defaultTimeoutMs?: number;
     });
+    /**
+     * Subscribe without requiring a Plugin EventEmitter.
+     * Returns unsubscribe.
+     */
+    subscribe(name: LoginAssistEventName, listener: (task: PendingLoginTask) => void): () => void;
     /**
      * 生产者：等待用户输入后 resolve。会发出 endpoint.login.pending 事件，未消费前可被 listPending 拉取（刷新后可继续消费）。
      * 超时后 reject 并 emit `endpoint.login.expired`。
      */
-    waitForInput(adapter: string, endpointKey: string, type: LoginAssistType, payload?: PendingLoginTaskPayload, options?: WaitForInputOptions): Promise<string | Record<string, unknown>>;
+    waitForInput(adapter: string, endpointKey: string, type: LoginAssistType, payload: PendingLoginTaskPayload, options: WaitForInputOptions): Promise<string | Record<string, unknown>>;
     /**
      * 消费者：提交结果，对应 waitForInput 的 Promise 会 resolve。
      */
@@ -62,10 +75,15 @@ export declare class LoginAssist {
      * 消费者：取消某条待办，对应 Promise 会 reject。
      */
     cancel(id: string, reason?: string): boolean;
+    /**
+     * Cancel pending tasks created by one exact Endpoint instance.
+     */
+    cancelOwned(owner: object, reason?: string): number;
     /**
      * 列出未消费的待办（供 Web/CLI 展示，刷新后仍可拉取同一列表）。
      */
     listPending(): PendingLoginTask[];
+    hasPending(adapter?: string, endpointKey?: string): boolean;
     dispose(): void;
 }
 declare module '../plugin.js' {

package/lib/built/login-assist.js

@@ -15,20 +15,36 @@ export const DEFAULT_LOGIN_ASSIST_TIMEOUT_MS = 5 * 60 * 1000;
 // LoginAssist 服务
 // ============================================================================
 export class LoginAssist {
-    plugin;
+    bus;
     pending = new Map();
+    local = new Map();
     idSeq = 0;
     /** 构造时默认超时；可被 waitForInput options 覆盖 */
     defaultTimeoutMs;
-    constructor(plugin, options) {
-        this.plugin = plugin;
+    constructor(bus, options) {
+        this.bus = bus ?? null;
         this.defaultTimeoutMs = options?.defaultTimeoutMs ?? DEFAULT_LOGIN_ASSIST_TIMEOUT_MS;
     }
+    /**
+     * Subscribe without requiring a Plugin EventEmitter.
+     * Returns unsubscribe.
+     */
+    subscribe(name, listener) {
+        let set = this.local.get(name);
+        if (!set) {
+            set = new Set();
+            this.local.set(name, set);
+        }
+        set.add(listener);
+        return () => {
+            set.delete(listener);
+        };
+    }
     /**
      * 生产者：等待用户输入后 resolve。会发出 endpoint.login.pending 事件，未消费前可被 listPending 拉取（刷新后可继续消费）。
      * 超时后 reject 并 emit `endpoint.login.expired`。
      */
-    waitForInput(adapter, endpointKey, type, payload = {}, options) {
+    waitForInput(adapter, endpointKey, type, payload, options) {
         const id = `login-${Date.now()}-${++this.idSeq}`;
         const timeoutMs = resolveTimeoutMs(options?.timeoutMs, this.defaultTimeoutMs);
         const createdAt = Date.now();
@@ -42,14 +58,14 @@ export class LoginAssist {
             ...(timeoutMs != null ? { expiresAt: createdAt + timeoutMs } : {}),
         };
         const promise = new Promise((resolve, reject) => {
-            const entry = { task, resolve, reject };
+            const entry = { task, owner: options.owner, resolve, reject };
             if (timeoutMs != null) {
                 entry.timer = setTimeout(() => {
                     if (!this.pending.has(id))
                         return;
                     this.pending.delete(id);
                     try {
-                        this.plugin.emit('endpoint.login.expired', task);
+                        this.#notify('endpoint.login.expired', task);
                     }
                     catch {
                         /* observer failure must not leave the producer hanging forever */
@@ -60,7 +76,7 @@ export class LoginAssist {
                 entry.timer.unref?.();
             }
             this.pending.set(id, entry);
-            this.plugin.emit('endpoint.login.pending', task);
+            this.#notify('endpoint.login.pending', task);
         });
         return promise;
     }
@@ -75,6 +91,7 @@ export class LoginAssist {
         if (entry.timer)
             clearTimeout(entry.timer);
         entry.resolve(value);
+        this.#notify('endpoint.login.resolved', entry.task);
         return true;
     }
     /**
@@ -88,14 +105,44 @@ export class LoginAssist {
         if (entry.timer)
             clearTimeout(entry.timer);
         entry.reject(new Error(reason));
+        this.#notify('endpoint.login.resolved', entry.task);
         return true;
     }
+    /**
+     * Cancel pending tasks created by one exact Endpoint instance.
+     */
+    cancelOwned(owner, reason = 'superseded') {
+        let count = 0;
+        for (const [id, entry] of [...this.pending]) {
+            if (entry.owner !== owner)
+                continue;
+            this.pending.delete(id);
+            if (entry.timer)
+                clearTimeout(entry.timer);
+            entry.reject(new Error(reason));
+            this.#notify('endpoint.login.resolved', entry.task);
+            count += 1;
+        }
+        return count;
+    }
     /**
      * 列出未消费的待办（供 Web/CLI 展示，刷新后仍可拉取同一列表）。
      */
     listPending() {
         return [...this.pending.values()].map((e) => e.task);
     }
+    hasPending(adapter, endpointKey) {
+        if (adapter == null)
+            return this.pending.size > 0;
+        for (const entry of this.pending.values()) {
+            if (entry.task.adapter !== adapter)
+                continue;
+            if (endpointKey != null && entry.task.endpointKey !== endpointKey)
+                continue;
+            return true;
+        }
+        return false;
+    }
     dispose() {
         for (const [, entry] of this.pending) {
             if (entry.timer)
@@ -103,6 +150,23 @@ export class LoginAssist {
             entry.reject(new Error('LoginAssist disposed'));
         }
         this.pending.clear();
+        this.local.clear();
+    }
+    #notify(name, task) {
+        try {
+            this.bus?.emit(name, task);
+        }
+        catch {
+            /* bus observers must not break producer */
+        }
+        for (const listener of this.local.get(name) ?? []) {
+            try {
+                listener(task);
+            }
+            catch {
+                /* same */
+            }
+        }
     }
 }
 function resolveTimeoutMs(explicit, fallback) {

package/lib/built/message-enrich.d.ts

@@ -27,7 +27,6 @@ export interface SyntheticMessageInput {
     };
     channel: MessageChannel;
     id?: string;
-    quote_id?: string;
     reply?: (content: SendContent, quote?: boolean | string) => Promise<string>;
     extra?: Record<string, unknown>;
 }

package/lib/built/message-enrich.js

@@ -39,7 +39,6 @@ export function createSyntheticMessage(input) {
         $channel: input.channel,
         $timestamp: Date.now(),
         $raw: '',
-        $quote_id: input.quote_id,
     });
 }
 /** hook context 中的 commMessage 字段（AIHookEvent.context） */

package/lib/built/rich-segments/markdown-to-text.js

@@ -9,8 +9,8 @@ export function markdownToPlainText(md) {
     text = text.replace(/!\[[^\]]*\]\([^)]*\)/g, '');
     text = text.replace(/\[([^\]]+)\]\([^)]*\)/g, '$1');
     text = text.replace(/^#{1,6}\s+/gm, '');
-    text = text.replace(/^\s*>\s?/gm, '');
-    text = text.replace(/^\s*[-*+]\s+/gm, '');
+    text = text.replace(/^[ \t]*>[ \t]?/gm, '');
+    text = text.replace(/^[ \t]*[-*+][ \t]+/gm, '');
     text = text.replace(/\*\*([^*]+)\*\*/g, '$1');
     text = text.replace(/__([^_]+)__/g, '$1');
     text = text.replace(/\*([^*]+)\*/g, '$1');

package/lib/built/schema-endpoint-manager.js

@@ -1,4 +1,4 @@
-import { Prompt } from '../prompt.js';
+import { SchemaInteraction } from '../schema-interaction.js';
 function readConfigEndpoints(root, context) {
     const configService = root.inject('config');
     const raw = configService?.getRaw(configService.primaryFile);
@@ -18,10 +18,10 @@ export class SchemaEndpointManager {
         return readConfigEndpoints(this.adapter.plugin.root, String(this.adapter.name));
     }
     async addEndpoint(ctx) {
-        const prompt = new Prompt(this.adapter.plugin, ctx.message);
+        const interaction = new SchemaInteraction(this.adapter.plugin, ctx.message);
         await ctx.onStatusUpdate(`请按提示填写 ${String(this.adapter.name)} endpoint 配置：`);
-        const name = await prompt.text('Endpoint id（zhin.config endpoints[].id）：');
-        const fields = await prompt.getValueWithSchema(this.schema);
+        const name = await interaction.text('Endpoint id（zhin.config endpoints[].id）：');
+        const fields = await interaction.getValueWithSchema(this.schema);
         return {
             context: String(this.adapter.name),
             id: name.trim(),
@@ -34,8 +34,8 @@ export class SchemaEndpointManager {
             throw new Error(`配置中不存在 ${String(this.adapter.name)}/${name}`);
         }
         await ctx.onStatusUpdate(`编辑 ${String(this.adapter.name)}/${name}，留空字段将保留原值。`);
-        const prompt = new Prompt(this.adapter.plugin, ctx.message);
-        const fields = await prompt.getValueWithSchema(this.schema);
+        const interaction = new SchemaInteraction(this.adapter.plugin, ctx.message);
+        const fields = await interaction.getValueWithSchema(this.schema);
         return {
             ...existing,
             ...fields,

package/lib/built/segment-contract/types.d.ts

@@ -1,38 +1,11 @@
-/**
- * Canonical Segment SSOT — IM + AI 共用 JSON 形状（snake_case data）。
- * @see docs/architecture/segment-content-model.md
- */
-export interface SegmentBase {
-    type: string;
-    data: Record<string, unknown>;
-    platform?: Record<string, unknown>;
-}
+/** Canonical Segment SSOT lives in @zhin.js/im-contract. */
+import type { MediaRef, SegmentBase } from '@zhin.js/im-contract';
+export type { ForwardSegment, MediaRef, MentionSegment, ReplySegment, Segment, SegmentBase, TextSegment, } from '@zhin.js/im-contract';
 /**
  * 媒体引用占位（全框架唯一媒体表达）。
  * kind=file：平台侧不透明文件引用（如 Telegram file_id、Milky resource_id），
  * 非 URL/本地路径，消费方需经平台 API 解析。
  */
-export interface MediaRef {
-    kind: 'url' | 'path' | 'base64' | 'file';
-    value: string;
-    mime_type?: string;
-    file_name?: string;
-    /** 字节数（已知时携带，供大小预检与日志） */
-    size?: number;
-}
-export interface TextSegment extends SegmentBase {
-    type: 'text';
-    data: {
-        text: string;
-    };
-}
-export interface MentionSegment extends SegmentBase {
-    type: 'mention';
-    data: {
-        target: string;
-        name?: string;
-    };
-}
 export interface ImageSegment extends SegmentBase {
     type: 'image';
     data: {
@@ -62,20 +35,6 @@ export interface FileSegment extends SegmentBase {
         name?: string;
     };
 }
-export interface ReplySegment extends SegmentBase {
-    type: 'reply';
-    data: {
-        message_id: string;
-    };
-}
-export interface ForwardSegment extends SegmentBase {
-    type: 'forward';
-    data: {
-        forward_id: string;
-        title?: string;
-        messages?: Segment[][];
-    };
-}
 export interface FaceSegment extends SegmentBase {
     type: 'face';
     data: {
@@ -96,4 +55,4 @@ export interface RpsSegment extends SegmentBase {
     };
 }
 /** 规范态 segment（严格校验 text / mention / image / audio / video / file / reply / forward / face / dice / rps） */
-export type Segment = TextSegment | MentionSegment | ImageSegment | AudioSegment | VideoSegment | FileSegment | ReplySegment | ForwardSegment | FaceSegment | DiceSegment | RpsSegment | SegmentBase;
+export type LegacySpecificSegment = ImageSegment | AudioSegment | VideoSegment | FileSegment | FaceSegment | DiceSegment | RpsSegment;

package/lib/built/segment-contract/types.js

@@ -1,5 +1 @@
-/**
- * Canonical Segment SSOT — IM + AI 共用 JSON 形状（snake_case data）。
- * @see docs/architecture/segment-content-model.md
- */
 export {};

package/lib/built/user-interaction.d.ts

@@ -0,0 +1,30 @@
+import type { UserInteractionContent, UserInteractionRequest } from '@zhin.js/interaction';
+import type { SendContent } from '../plugin-runtime/im/contracts.js';
+import type { ButtonStyle } from './interactive-segments/types.js';
+export interface UserInteractionAction {
+    readonly label: string;
+    readonly value: string;
+    readonly style?: ButtonStyle;
+}
+export interface UserInteractionView extends UserInteractionContent {
+    readonly actions?: readonly UserInteractionAction[];
+}
+export interface UserInteractionProgress extends UserInteractionContent {
+    readonly index: number;
+    readonly total: number;
+}
+export type UserInteractionParseResult = Readonly<{
+    ok: true;
+    value: unknown;
+}> | Readonly<{
+    ok: false;
+    message: string;
+}>;
+/** Fail early for interaction definitions that could never produce an unambiguous answer. */
+export declare function assertUserInteractionRequest(request: UserInteractionRequest): void;
+/** Project semantic content into canonical Markdown + keyboard segments. */
+export declare function renderUserInteraction(view: UserInteractionView): SendContent;
+/** Derive presentation and controls from one discriminated request. */
+export declare function projectUserInteraction(request: UserInteractionRequest, progress?: UserInteractionProgress): UserInteractionView;
+/** Parse and validate one user reply without transport knowledge. */
+export declare function parseUserInteractionAnswer(request: UserInteractionRequest, rawInput: string): UserInteractionParseResult;