@napuketto/adapter 0.6.0 → 0.7.1

package/dist/milky/index.d.mts

@@ -42,6 +42,51 @@ declare class MessageSeqIndex {
   private evict;
 }
 //#endregion
+//#region src/milky/action/error-map.d.ts
+/** KernelErrorCode → Milky retcode 映射表（-400/-403 规范语义，其余自定负数）。 */
+type MilkyErrorCodeMap = Record<KernelErrorCode, number>;
+//#endregion
+//#region src/milky/action/base-action.d.ts
+/** Milky 动作结果（retcode 为规范负数族；transport 原样组装信封）。 */
+interface MilkyActionResult<T> {
+  status: "ok" | "failed";
+  retcode: number;
+  data: T | null;
+  message: string;
+}
+declare abstract class MilkyAction<TPayload, TReturn> {
+  abstract readonly name: string;
+  abstract readonly schema: ZodType<TPayload>;
+  protected abstract readonly errorCodeMap: MilkyErrorCodeMap;
+  protected abstract _handle(payload: TPayload): Promise<TReturn>;
+  /** 校验并执行（HTTP /api 入口；WS /event 不承载动作）。 */
+  handle(payload: unknown): Promise<MilkyActionResult<TReturn>>;
+}
+//#endregion
+//#region src/milky/config.d.ts
+/** Milky 配置 schema。 */
+declare const milkyConfigSchema: z.ZodObject<{
+  enabled: z.ZodDefault<z.ZodBoolean>;
+  host: z.ZodDefault<z.ZodString>;
+  port: z.ZodDefault<z.ZodNumber>;
+  token: z.ZodDefault<z.ZodString>;
+  eventModes: z.ZodDefault<z.ZodArray<z.ZodEnum<{
+    sse: "sse";
+    ws: "ws";
+  }>>>;
+  webhooks: z.ZodDefault<z.ZodArray<z.ZodString>>;
+  cacheDir: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+/** Milky 配置类型（由 schema 推导）。 */
+type MilkyConfig = z.infer<typeof milkyConfigSchema>;
+//#endregion
+//#region src/milky/transport.d.ts
+/** 校准 logger 最小面（webhook 失败 / 配置异常提示；缺省静默）。 */
+interface MilkyLoggerLike {
+  warn(obj: unknown, msg?: string): void;
+  info(obj: unknown, msg?: string): void;
+}
+//#endregion
 //#region src/milky/api.d.ts
 /** MilkyApi 构造参数。 */
 interface MilkyApiOptions {
@@ -69,6 +114,8 @@ interface MilkyApiOptions {
   implVersion: string;
   /** 发送媒体 http(s)/base64 URI 下载缓存目录（缺省 = 远程媒体发送不可用）。 */
   mediaDir?: string;
+  /** 动作层可观测出口（P2 批次一：forward 临时消息撤回失败 warn；缺省静默）。 */
+  logger?: MilkyLoggerLike;
 }
 declare class MilkyApi {
   readonly msgApi: MsgApi;
@@ -89,6 +136,8 @@ declare class MilkyApi {
   readonly qqVersion: string;
   readonly implVersion: string;
   readonly mediaDir: string | undefined;
+  /** 动作层可观测出口（缺省静默）。 */
+  readonly logger: MilkyLoggerLike | undefined;
   /** message_seq ↔ msgId 双向映射（接收链路 record，动作侧反查）。 */
   readonly seqIndex: MessageSeqIndex;
   constructor(opts: MilkyApiOptions, seqIndex: MessageSeqIndex);
@@ -118,57 +167,12 @@ declare class MilkyApi {
   }>;
 }
 //#endregion
-//#region src/milky/action/error-map.d.ts
-/** KernelErrorCode → Milky retcode 映射表（-400/-403 规范语义，其余自定负数）。 */
-type MilkyErrorCodeMap = Record<KernelErrorCode, number>;
-//#endregion
-//#region src/milky/action/base-action.d.ts
-/** Milky 动作结果（retcode 为规范负数族；transport 原样组装信封）。 */
-interface MilkyActionResult<T> {
-  status: "ok" | "failed";
-  retcode: number;
-  data: T | null;
-  message: string;
-}
-declare abstract class MilkyAction<TPayload, TReturn> {
-  abstract readonly name: string;
-  abstract readonly schema: ZodType<TPayload>;
-  protected abstract readonly errorCodeMap: MilkyErrorCodeMap;
-  protected abstract _handle(payload: TPayload): Promise<TReturn>;
-  /** 校验并执行（HTTP /api 入口；WS /event 不承载动作）。 */
-  handle(payload: unknown): Promise<MilkyActionResult<TReturn>>;
-}
-//#endregion
 //#region src/milky/action/index.d.ts
 /** Milky 动作注册表（P0+P1 49 动作）。 */
 declare function createMilkyActionRegistry(opts: {
   api: MilkyApi;
 }): ActionRegistry<MilkyAction<unknown, unknown>>;
 //#endregion
-//#region src/milky/config.d.ts
-/** Milky 配置 schema。 */
-declare const milkyConfigSchema: z.ZodObject<{
-  enabled: z.ZodDefault<z.ZodBoolean>;
-  host: z.ZodDefault<z.ZodString>;
-  port: z.ZodDefault<z.ZodNumber>;
-  token: z.ZodDefault<z.ZodString>;
-  eventModes: z.ZodDefault<z.ZodArray<z.ZodEnum<{
-    sse: "sse";
-    ws: "ws";
-  }>>>;
-  webhooks: z.ZodDefault<z.ZodArray<z.ZodString>>;
-  cacheDir: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>;
-/** Milky 配置类型（由 schema 推导）。 */
-type MilkyConfig = z.infer<typeof milkyConfigSchema>;
-//#endregion
-//#region src/milky/transport.d.ts
-/** 校准 logger 最小面（webhook 失败 / 配置异常提示；缺省静默）。 */
-interface MilkyLoggerLike {
-  warn(obj: unknown, msg?: string): void;
-  info(obj: unknown, msg?: string): void;
-}
-//#endregion
 //#region src/milky/adapter.d.ts
 /** 适配器构造参数（api 相关字段继承 MilkyApiOptions）。 */
 interface MilkyAdapterOptions extends MilkyApiOptions {

package/dist/milky/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/milky/helper/seq-index.ts","../../src/milky/api.ts","../../src/milky/action/error-map.ts","../../src/milky/action/base-action.ts","../../src/milky/action/index.ts","../../src/milky/config.ts","../../src/milky/transport.ts","../../src/milky/adapter.ts"],"mappings":";;;;;;UAuBiB;EACb,UAAU;EACV;EACA;;cAGS;;mBAEQ;;mBAEA;;mBAEA;;EAGjB,OAAO,KAAK;;EAeZ,aAAa,UAAU,UAAU,iBAAiB;;;;;EAQlD,iBACI,mBACD;IAAc;IAAoB;IAAkB;;;UAgB/C;;;;;EAQR,cAAc,eAAe,OAAO;;EAepC,eAAe,gBAAgB;;UAKvB;;;;;UCjFK;EACb,QAAQ;EACR,UAAU;EACV,WAAW;EACX,YAAY;;EAEZ,gBAAgB;EAChB,WAAW;EACX,QAAQ;EACR,gBAAgB;EAChB,cAAc;;EAEd;IAAQ;IAAa;IAAkB;;;EAEvC,aAAa;;EAEb;;EAEA;;EAEA;;cAGS;WACA,QAAQ;WACR,UAAU;WACV,WAAW;WACX,YAAY;WACZ,gBAAgB;WAChB,WAAW;WACX,QAAQ;WACR,gBAAgB;WAChB,cAAc;WACd;IAAQ;IAAa;IAAkB;;WACvC,YAAY;WACZ;WACA;WACA;;WAEA,UAAU;EAEnB,YAAY,MAAM,iBAAiB,UAAU;;EAmB7C,SAAS,iBAAiB,QAAQ;;EAKlC,SAAS,iBAAiB,QAAQ;;;;;EAQ5B,kBAAkB,uBAAuB;;;;;EAiBzC,YAAY,oCAAoC,aAAa,QAAQ;;;;;EAqBrE,kBACF,MAAM,MACN,aACA,UAAU,mBACX;;EAeG,kBACF,MAAM,MACN,gBACD;IAAU;IAAqB;;;;;;KCtJ1B,oBAAoB,OAAO;;;;UCItB,kBAAkB;EAC/B;EACA;EACA,MAAM;EACN;;uBAYkB,YAAY,UAAU;oBACtB;oBACA,QAAQ,QAAQ;8BACN,cAAc;qBAEvB,QAAQ,SAAS,WAAW,QAAQ;;EAGjD,OAAO,mBAAmB,QAAQ,kBAAkB;;;;;iBCiC9C,0BAA0B;EACtC,KAAK;IACL,eAAe;;;;cC/DN,mBAAiB,EAAA;;;;;;;;;;;GAe5B,EAAA,KAAA;;KAGU,cAAc,EAAE,aAAa;;;;UCQxB;EACb,KAAK,cAAc;EACnB,KAAK,cAAc;;;;;UCUN,4BAA4B;EACzC,QAAQ,eAAe;EACvB,aAAa;;EAEb,YAAY;;EAEZ,eAAe;;EAEf,eAAe;;EAEf,SAAS;;cAGA,8BAA8B,oBAAoB;WAClD;mBAEQ;mBACA;mBACA;mBACA;mBACA;mBACA;;WAER,UAAU,kBAAkB;UAC7B;UACA;EAER,YAAY,MAAM;;UAoBJ;;UAuBA;;UAMA;;UASN;;UA4BA;;UAQM;;UAuBA;;UAeN;;UASM;;UAWN;;UAkBM;;UASA;;UAgBA;;UAkBN;;UAWM;;UAaN;;UAcA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/milky/helper/seq-index.ts","../../src/milky/action/error-map.ts","../../src/milky/action/base-action.ts","../../src/milky/config.ts","../../src/milky/transport.ts","../../src/milky/api.ts","../../src/milky/action/index.ts","../../src/milky/adapter.ts"],"mappings":";;;;;;UAuBiB;EACb,UAAU;EACV;EACA;;cAGS;;mBAEQ;;mBAEA;;mBAEA;;EAGjB,OAAO,KAAK;;EAeZ,aAAa,UAAU,UAAU,iBAAiB;;;;;EAQlD,iBACI,mBACD;IAAc;IAAoB;IAAkB;;;UAgB/C;;;;;EAQR,cAAc,eAAe,OAAO;;EAepC,eAAe,gBAAgB;;UAKvB;;;;;KClGA,oBAAoB,OAAO;;;;UCItB,kBAAkB;EAC/B;EACA;EACA,MAAM;EACN;;uBAYkB,YAAY,UAAU;oBACtB;oBACA,QAAQ,QAAQ;8BACN,cAAc;qBAEvB,QAAQ,SAAS,WAAW,QAAQ;;EAGjD,OAAO,mBAAmB,QAAQ,kBAAkB;;;;;cC5BjD,mBAAiB,EAAA;;;;;;;;;;;GAe5B,EAAA,KAAA;;KAGU,cAAc,EAAE,aAAa;;;;UCQxB;EACb,KAAK,cAAc;EACnB,KAAK,cAAc;;;;;UCVN;EACb,QAAQ;EACR,UAAU;EACV,WAAW;EACX,YAAY;;EAEZ,gBAAgB;EAChB,WAAW;EACX,QAAQ;EACR,gBAAgB;EAChB,cAAc;;EAEd;IAAQ;IAAa;IAAkB;;;EAEvC,aAAa;;EAEb;;EAEA;;EAEA;;EAEA,SAAS;;cAGA;WACA,QAAQ;WACR,UAAU;WACV,WAAW;WACX,YAAY;WACZ,gBAAgB;WAChB,WAAW;WACX,QAAQ;WACR,gBAAgB;WAChB,cAAc;WACd;IAAQ;IAAa;IAAkB;;WACvC,YAAY;WACZ;WACA;WACA;;WAEA,QAAQ;;WAER,UAAU;EAEnB,YAAY,MAAM,iBAAiB,UAAU;;EAoB7C,SAAS,iBAAiB,QAAQ;;EAKlC,SAAS,iBAAiB,QAAQ;;;;;EAQ5B,kBAAkB,uBAAuB;;;;;EAiBzC,YAAY,oCAAoC,aAAa,QAAQ;;;;;EAqBrE,kBACF,MAAM,MACN,aACA,UAAU,mBACX;;EAeG,kBACF,MAAM,MACN,gBACD;IAAU;IAAqB;;;;;;iBC/FtB,0BAA0B;EACtC,KAAK;IACL,eAAe;;;;UCzBF,4BAA4B;EACzC,QAAQ,eAAe;EACvB,aAAa;;EAEb,YAAY;;EAEZ,eAAe;;EAEf,eAAe;;EAEf,SAAS;;cAGA,8BAA8B,oBAAoB;WAClD;mBAEQ;mBACA;mBACA;mBACA;mBACA;mBACA;;WAER,UAAU,kBAAkB;UAC7B;UACA;EAER,YAAY,MAAM;;UAoBJ;;UAuBA;;UAMA;;UASN;;UA4BA;;UAQM;;UAuBA;;UAeN;;UASM;;UAWN;;UAkBM;;UASA;;UAgBA;;UAkBN;;UAWM;;UAaN;;UAcA"}

package/dist/milky/index.mjs

@@ -27,6 +27,8 @@ var MilkyApi = class {
 	qqVersion;
 	implVersion;
 	mediaDir;
+	/** 动作层可观测出口（缺省静默）。 */
+	logger;
 	/** message_seq ↔ msgId 双向映射（接收链路 record，动作侧反查）。 */
 	seqIndex;
 	constructor(opts, seqIndex) {
@@ -44,6 +46,7 @@ var MilkyApi = class {
 		this.qqVersion = opts.qqVersion;
 		this.implVersion = opts.implVersion;
 		this.mediaDir = opts.mediaDir;
+		this.logger = opts.logger;
 		this.seqIndex = seqIndex;
 	}
 	/** uin → uid（私聊目标 / at 段发送转换 / 群管动作的 uid 入参）。 */
@@ -939,8 +942,8 @@ async function writeBase64(payload, mediaDir) {
 * 跳过——规范兼容性要求「数组中未知项跳过」）。forward 接收段不经 canonical：
 * kernel 无 MULTI_FORWARD 分支，adapter 从 RawMessage 提取 resId 后经
 * incomingForwardSegment + ctx 注入。
-* 发送方向：OutgoingSegment → canonical（10 种中映射 9 种；forward 发送需要
-* kernel 组装任意内容的新转发（未探测），显式报错不静默跳过）。
+* 发送方向：OutgoingSegment → canonical（10 种全映射；forward 顶层段不走本转换器，
+* 由 sendMilkyMessage 分流到组装链——本转换器内 forward 报错只拦截混发/嵌套）。
 */
 /** uin 字符串 → Milky user_id（非有限正数 = 转换失败）。 */
 function toUserId(uin) {
@@ -1114,7 +1117,9 @@ function rawToPayload(raw) {
 /**
 * OutgoingSegment 数组 → canonical 元素（同步映射；媒体 URI 解析与 at uin→uid
 * 由调用方在返回值上继续处理）。
-* forward 显式报错（发送走 kernel 专用链路，P1 接）。
+* forward 在此报错：顶层 forward 已由 sendMilkyMessage 分流到组装链（message.ts，
+* P2 批次一），命中本分支 = forward 与其他段混发漏网或嵌套 forward（组装链内逐项
+* 转换经过此处）——均显式拒绝。
 */
 function outgoingSegmentsToCanonical(segments) {
 	const elements = [];
@@ -1179,7 +1184,7 @@ function outgoingSegmentsToCanonical(segments) {
 				raw: seg.data.json_payload
 			});
 			break;
-		case "forward": throw kernelError("forward 段发送暂未支持（需 kernel 组装任意内容的新转发，P2 探测）", "INVALID_PARAM");
+		case "forward": throw kernelError("forward 段不可与其他消息段混发或嵌套（顶层 forward 须单独发送）", "INVALID_PARAM");
 	}
 	return {
 		elements,
@@ -1399,14 +1404,70 @@ async function recallBySeq(peer, seq, api) {
 	if (msgId === void 0) throw kernelError(`消息 ${seq} 不存在`, "NOT_FOUND");
 	await api.msgApi.recallMessage(peer, [msgId]);
 }
-/** 发送核心：segments → canonical（URI/ID 转换）→ sendMessage → 回查输出。 */
+/** 发送核心：segments → canonical（URI/ID 转换）→ sendMessage → 回查输出。
+*  forward 段分流到组装链（P2 批次一，临时消息法）。 */
 async function sendMilkyMessage(peer, segments, api) {
+	if (segments.some((s) => s.type === "forward")) return await sendForwardComposition(peer, segments, api);
 	const { elements, atUins } = outgoingSegmentsToCanonical(segments);
 	const resolved = await resolveElements(elements, atUins, api);
 	if (resolved.length === 0) throw kernelError("消息内容为空（全部消息段不可用）", "INVALID_PARAM");
 	const { msgId } = await api.msgApi.sendMessage(peer, resolved);
 	return await api.resolveSentOutput(peer, msgId);
 }
+/**
+* forward 段组装链（P2 批次一，milky.md §0.6）：仅支持单 forward 单独发。
+* 临时消息法：逐条发送 messages[i].segments → sendForwardMessage（buildMultiForwardMsg
+* 以目标 peer 的真实消息组装 → sendMsg）→ best-effort 撤回临时消息 → 回查输出。
+*
+* 已知差异（规范语义 vs kernel 出口，待实机联调）：节点发送者恒为机器人自己
+* （user_id / sender_name / time 不参与组装）；title / preview / summary / prompt 忽略。
+*/
+async function sendForwardComposition(peer, segments, api) {
+	if (segments.length !== 1) throw kernelError("forward 段必须单独发送（不支持与其他消息段混发）", "INVALID_PARAM");
+	const [forward] = segments;
+	if (forward === void 0 || forward.type !== "forward") throw kernelError("forward 组装链收到非 forward 段", "UNKNOWN");
+	const messages = narrowForwardMessages(forward);
+	const srcMsgIds = [];
+	for (const [i, item] of messages.entries()) {
+		const { elements, atUins } = outgoingSegmentsToCanonical(item.segments);
+		const resolved = await resolveElements(elements, atUins, api);
+		if (resolved.length === 0) throw kernelError(`forward 第 ${i + 1} 条消息无可用内容段`, "INVALID_PARAM");
+		const { msgId } = await api.msgApi.sendMessage(peer, resolved);
+		srcMsgIds.push(msgId);
+	}
+	const { msgId } = await api.msgApi.sendForwardMessage(peer, peer, srcMsgIds);
+	await recallTempMessages(peer, srcMsgIds, api);
+	return await api.resolveSentOutput(peer, msgId);
+}
+/**
+* forward 段载荷收窄（入口 schema 只保证 data 为 record）：messages 非空数组，
+* 项内 segments 非空数组。user_id / sender_name / time 不参与组装不校验
+* （丢弃字段不设门槛）；title / preview / summary / prompt 忽略。
+*/
+function narrowForwardMessages(forward) {
+	const raw = forward.data.messages;
+	if (!Array.isArray(raw) || raw.length === 0) throw kernelError("forward 段 messages 必须是非空数组", "INVALID_PARAM");
+	const out = [];
+	for (const item of raw) {
+		if (typeof item !== "object" || item === null) throw kernelError("forward 段 messages 项必须是对象", "INVALID_PARAM");
+		const segments = item.segments;
+		if (!Array.isArray(segments) || segments.length === 0) throw kernelError("forward 段 messages 项的 segments 必须是非空数组", "INVALID_PARAM");
+		out.push(item);
+	}
+	return out;
+}
+/** 临时消息清理（best-effort：失败只留可见垃圾，转发已发出——warn 可观测不抛）。 */
+async function recallTempMessages(peer, msgIds, api) {
+	try {
+		await api.msgApi.recallMessage(peer, msgIds);
+	} catch (e) {
+		api.logger?.warn({
+			peer: peer.peerUid,
+			count: msgIds.length,
+			error: e instanceof Error ? e.message : String(e)
+		}, "milky: forward 临时消息撤回失败（转发已发出）");
+	}
+}
 /** 元素二次解析：at uin→uid + 远程媒体 URI 落盘（reply seq 已在映射层兜底原样）。 */
 async function resolveElements(elements, atUins, api) {
 	const uinToUid = await resolveAtUins(atUins, api);