@nickyzj2023/ai 1.1.2 → 1.1.3

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default } from "./src-DzLCCWBV.mjs";
+import { i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default } from "./src-B0tl6AT5.mjs";
 import { existsSync } from "node:fs";
 import { loadEnvFile } from "node:process";
 import readline from "node:readline";

package/dist/index.d.mts

@@ -150,8 +150,8 @@ declare const _default$1: ToolDefinition;
 //#endregion
 //#region src/utils/compact/types.d.ts
 declare namespace Compact {
-  type ReplacerOfToolResultContent = (content: Message["content"]) => Message["content"];
-  type ReplacerOfMediaContent = (content: Message["content"]) => Message["content"];
+  type ReplacerOfToolResultContent = (content: Message["content"], options?: Record<string, any>) => Promise<Message["content"]> | Message["content"];
+  type ReplacerOfMediaContent = (content: Message["content"], options?: Record<string, any>) => Promise<Message["content"]> | Message["content"];
   type SummarizeOptions = {
     /** 用什么模型总结 */
     model: Model;
@@ -180,8 +180,16 @@ declare namespace Compact {
 }
 //#endregion
 //#region src/utils/compact/strategy.d.ts
-declare const softDeleteToolResults: (messages: Message[], replacer: Compact.ReplacerOfToolResultContent) => Message[];
-declare const softDeleteOldMediaMessages: (messages: Message[], replacer: Compact.ReplacerOfMediaContent) => Message[];
+declare const softDeleteToolResults: (messages: Message[], options: {
+  replacer?: Compact.ReplacerOfToolResultContent;
+  mark: string;
+  model?: Model;
+}) => Promise<Message[]>;
+declare const softDeleteOldMediaMessages: (messages: Message[], options: {
+  replacer?: Compact.ReplacerOfMediaContent;
+  mark: string;
+  model?: Model;
+}) => Promise<Message[]>;
 /**
  * 清理软删除后残留的占位消息（信息在软删除时已丢失，此时删除不损失任何额外信息）
  * @param messages 可压缩区消息数组，直接原地删除
@@ -229,6 +237,10 @@ declare const compact: ((messages: Message[], model: Model, options?: {
    * @default (content) => "（已被丢弃）"
    */
   replacerOfMediaContent?: Compact.ReplacerOfMediaContent;
+  /**
+   * 用于标记哪些消息被软删除了
+   */
+  softDeletedMessageMark?: string;
   /**
    * 上下文>总上下文*ratio时清理软删除残留的占位消息
    * @default 0.7

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as defineTool, i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default, t as compact } from "./src-DzLCCWBV.mjs";
+import { a as defineTool, i as defineModel, n as get_weather_default, o as runAgent, r as get_time_default, t as compact } from "./src-B0tl6AT5.mjs";
 export { compact, defineModel, defineTool, get_time_default as getTime, get_weather_default as getWeather, runAgent };

package/dist/{src-DzLCCWBV.mjs → src-B0tl6AT5.mjs}

@@ -278,16 +278,52 @@ const findToolGroupRange = (messages, toolIndex) => {
 };
 //#endregion
 //#region src/utils/compact/strategy.ts
-const softDeleteToolResults = (messages, replacer) => {
+/** 默认的软删除多模态消息策略：让大模型精简消息内容 */
+const defaultReplacerOfToolResultContent = async (content, options) => {
+	const { mark, model } = options ?? {};
+	const messages = [{
+		role: "user",
+		content
+	}, {
+		role: "user",
+		content: "请用一两句话对上条消息做个“省流”"
+	}];
+	let simplifiedContent = mark;
+	for await (const e of runAgent(model, messages, [])) if (e.type === "content_delta") simplifiedContent += e.delta;
+	return simplifiedContent;
+};
+const softDeleteToolResults = async (messages, options) => {
+	const { replacer = defaultReplacerOfToolResultContent, mark, model } = options ?? {};
+	if (!replacer && !model) return [];
 	const softDeleted = [];
-	for (const message of messages) if (message?.role === "tool") {
-		message.content = replacer(message.content);
+	for (const message of messages) if (message?.role === "tool" && typeof message.content === "string") {
+		if (message.content.startsWith(mark)) continue;
+		message.content = await replacer(message.content, {
+			mark,
+			model
+		});
 		softDeleted.push(message);
 	}
 	if (softDeleted.length > 0) logger(`软删除了${softDeleted.length}条工具调用结果消息`);
 	return softDeleted;
 };
-const softDeleteOldMediaMessages = (messages, replacer) => {
+/** 默认的软删除多模态消息策略：让大模型精简消息内容 */
+const defaultReplacerOfMediaContent = async (content, options) => {
+	const { mark, model } = options ?? {};
+	const messages = [{
+		role: "user",
+		content
+	}, {
+		role: "user",
+		content: "请用一两句话描述上方的多模态消息"
+	}];
+	let simplifiedContent = mark;
+	for await (const e of runAgent(model, messages, [])) if (e.type === "content_delta") simplifiedContent += e.delta;
+	return simplifiedContent;
+};
+const softDeleteOldMediaMessages = async (messages, options) => {
+	const { replacer = defaultReplacerOfMediaContent, mark, model } = options ?? {};
+	if (!replacer && !model) return [];
 	const mediaTypes = [
 		"image_url",
 		"input_audio",
@@ -295,7 +331,10 @@ const softDeleteOldMediaMessages = (messages, replacer) => {
 	];
 	const softDeleted = [];
 	for (const message of messages) if (message && Array.isArray(message.content) && message.content.some((part) => mediaTypes.includes(part.type))) {
-		message.content = replacer(message.content);
+		message.content = await replacer(message.content, {
+			mark,
+			model
+		});
 		softDeleted.push(message);
 	}
 	if (softDeleted.length > 0) logger(`软删除了${softDeleted.length}条旧图片/音频/视频消息`);
@@ -393,7 +432,7 @@ const hardDeleteOldMessages = (messages) => {
 * 自动优化上下文，类似AI Coding Agent的/compact命令
 */
 const compact = Object.assign(async (messages, model, options) => {
-	const { usage, keepCount = 10, ratioToCompactToolResult = .5, replacerOfToolResultContent = () => "（工具结果已消费）", ratioToCompactMedia = .6, replacerOfMediaContent = () => "（消息已过期）", ratioToClearSoftDeletedMessages = .7, ratioToSummarize = .8, summarizeOptions } = options ?? {};
+	const { usage, keepCount = 10, ratioToCompactToolResult = .5, replacerOfToolResultContent, ratioToCompactMedia = .6, replacerOfMediaContent, ratioToClearSoftDeletedMessages = .7, softDeletedMessageMark = "[已简化]", ratioToSummarize = .8, summarizeOptions } = options ?? {};
 	const context = model?.context ?? 131072;
 	const tokens = usage?.total_tokens ?? estimateTokens(messages);
 	const result = {
@@ -413,11 +452,21 @@ const compact = Object.assign(async (messages, model, options) => {
 	const reserved = messages.slice(endIndex);
 	const softDeleted = /* @__PURE__ */ new Set();
 	if (tokens > context * ratioToCompactToolResult) {
-		for (const message of softDeleteToolResults(compressible, replacerOfToolResultContent)) softDeleted.add(message);
+		const softDeletedMessages = await softDeleteToolResults(compressible, {
+			replacer: replacerOfToolResultContent,
+			mark: softDeletedMessageMark,
+			model
+		});
+		for (const message of softDeletedMessages) softDeleted.add(message);
 		result.hasCompactedToolResult = true;
 	}
 	if (tokens > context * ratioToCompactMedia) {
-		for (const message of softDeleteOldMediaMessages(compressible, replacerOfMediaContent)) softDeleted.add(message);
+		const softDeletedMessages = await softDeleteOldMediaMessages(compressible, {
+			replacer: replacerOfMediaContent,
+			mark: softDeletedMessageMark,
+			model
+		});
+		for (const message of softDeletedMessages) softDeleted.add(message);
 		result.hasCompactedMedia = true;
 	}
 	if (tokens > context * ratioToClearSoftDeletedMessages) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nickyzj2023/ai",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "我的“pi”，参考了pi-from-scratch",
   "type": "module",
   "main": "./dist/index.mjs",