@aalis/plugin-agent 0.15.2 → 0.16.0

package/dist/helpers.d.ts

@@ -8,7 +8,7 @@
  */
 import type { PersonaSessionOptions } from '@aalis/api-persona';
 import type { SessionConfig } from '@aalis/api-session-manager';
-import type { IncomingMessage, Message } from '@aalis/schema-message';
+import type { IncomingMessage, Message, ToolCall } from '@aalis/schema-message';
 /**
  * 将时间戳格式化为可读的时间标签：同年 `M/D HH:mm`，跨年 `YYYY/M/D HH:mm`。
  *
@@ -48,6 +48,8 @@ export declare function estimateTextTokens(text: string): number;
 export declare function estimateMsgTokens(msg: Message): number;
 /** 估算一组消息的总 token 数 */
 export declare function estimateTokens(messages: Message[]): number;
+/** 估算一组消息里历史与工具结果（system 以外的消息）的 token 数，与用量拆分的 history、toolResults 两项同一口径 */
+export declare function estimateHistoryTokens(messages: Message[]): number;
 /** 比较两条消息是否在 role/timestamp/name/content 维度上等价（不比较 toolCalls / id） */
 export declare function isSameMessage(a: Message, b: Message): boolean;
 /**
@@ -73,10 +75,22 @@ export declare function describeLLMFailure(available: readonly string[], wanted?
  * 会话解析结果 → persona 的会话选项。真实回合与 token:request 快照共用这一份构造，
  * 快照里 persona 那一桶才会按会话实际人设与额外提示估算。无 session-manager 时给 undefined（全局默认）。
  */
-export declare function toPersonaOptions(resolved: Omit<SessionConfig, 'sessionDefaults'> | undefined): PersonaSessionOptions | undefined;
+export declare function toPersonaOptions(resolved: SessionConfig | undefined): PersonaSessionOptions | undefined;
 /**
  * 调试日志里的工具参数。参数经 `agent:tool:before` 钩子后可能含 JSON 序列化不了的值（BigInt、循环引用），
  * 序列化失败时回落为说明文字：日志不能让工具调用失败。
  */
 export declare function formatToolArgsForLog(args: unknown): string;
+/**
+ * 解析一次工具调用的参数。arguments 不是 JSON 对象时回 error（回给模型的错误，带截断的原文），调用里的 arguments 换成
+ * `{}`：这次调用随 assistant 消息进本回合的消息与存档，下一轮会被模型服务插件原样发回，坏 JSON 不能跟着重放。
+ * 无参工具的 arguments 常是空串（流式路径没有 argument delta 时拼出来就是 ''），按空对象算，原样保留
+ */
+export declare function parseToolArguments(toolCall: ToolCall): {
+    toolCall: ToolCall;
+    args: Record<string, unknown>;
+} | {
+    toolCall: ToolCall;
+    error: string;
+};
 //# sourceMappingURL=helpers.d.ts.map

package/dist/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACtE;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAW/D;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,QASlB,CAAC;AAEb;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI,CAoB5E;AAWD,iCAAiC;AACjC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiBvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAQtD;AAED,uBAAuB;AACvB,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAI1D;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAO7D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAC9C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,GACnC,MAAM,CAsBR;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,GAAG,SAAS,GAC3D,qBAAqB,GAAG,SAAS,CAQnC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAM1D"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAW/D;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,QASlB,CAAC;AAEb;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,GAAG,IAAI,CAoB5E;AAWD,iCAAiC;AACjC,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAiBvD;AAMD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAQtD;AAED,uBAAuB;AACvB,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAI1D;AAED,8EAA8E;AAC9E,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAEjE;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAO7D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAC9C,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,GACnC,MAAM,CAsBR;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,SAAS,GAAG,qBAAqB,GAAG,SAAS,CAQvG;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAM1D;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,GACjB;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAkB/F"}

package/dist/helpers.js

@@ -1,3 +1,4 @@
+import { truncateChars } from '@aalis/util-text-normalize';
 /**
  * 将时间戳格式化为可读的时间标签：同年 `M/D HH:mm`，跨年 `YYYY/M/D HH:mm`。
  *
@@ -122,6 +123,10 @@ export function estimateTokens(messages) {
         total += estimateMsgTokens(msg);
     return total;
 }
+/** 估算一组消息里历史与工具结果（system 以外的消息）的 token 数，与用量拆分的 history、toolResults 两项同一口径 */
+export function estimateHistoryTokens(messages) {
+    return estimateTokens(messages.filter(m => m.role !== 'system'));
+}
 /** 比较两条消息是否在 role/timestamp/name/content 维度上等价（不比较 toolCalls / id） */
 export function isSameMessage(a, b) {
     return (a.role === b.role &&
@@ -193,4 +198,30 @@ export function formatToolArgsForLog(args) {
         return `（无法序列化：${err instanceof Error ? err.message : '未知原因'}）`;
     }
 }
+/** 坏工具参数回给模型时附带的原文最多多少字 */
+const RAW_ARGUMENTS_MAX = 200;
+/**
+ * 解析一次工具调用的参数。arguments 不是 JSON 对象时回 error（回给模型的错误，带截断的原文），调用里的 arguments 换成
+ * `{}`：这次调用随 assistant 消息进本回合的消息与存档，下一轮会被模型服务插件原样发回，坏 JSON 不能跟着重放。
+ * 无参工具的 arguments 常是空串（流式路径没有 argument delta 时拼出来就是 ''），按空对象算，原样保留
+ */
+export function parseToolArguments(toolCall) {
+    const raw = toolCall.function.arguments?.trim() ?? '';
+    try {
+        const parsed = raw ? JSON.parse(raw) : {};
+        // 工具按参数名取值：顶层是 null、数组或原始值的同坏 JSON 一样处理
+        if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            throw new TypeError(`顶层是 ${parsed === null ? 'null' : Array.isArray(parsed) ? '数组' : typeof parsed}`);
+        }
+        return { toolCall, args: parsed };
+    }
+    catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
+        return {
+            toolCall: { ...toolCall, function: { ...toolCall.function, arguments: '{}' } },
+            error: `工具参数不是合法 JSON 对象：${reason}；原文（前 ${RAW_ARGUMENTS_MAX} 字）：` +
+                `${truncateChars(raw, RAW_ARGUMENTS_MAX)}；请重新生成 arguments`,
+        };
+    }
+}
 //# sourceMappingURL=helpers.js.map

package/dist/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import type { LLMModel } from '@aalis/api-llm';
+import { type SessionManagerService } from '@aalis/api-session-manager';
 import { type Logger } from '@aalis/core';
 declare const _default: import("@aalis/core").PluginDefinition<{
     logger: import("@aalis/core").ServiceDescriptor<(identity: symbol) => Logger, Logger>;
@@ -8,19 +9,20 @@ declare const _default: import("@aalis/core").PluginDefinition<{
     contributions: import("@aalis/core").ServiceDescriptor<import("@aalis/api-contributions").ContributionRegistry, import("@aalis/api-contributions").Contributions>;
     lifecycle: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").LifecycleCap, import("@aalis/core").LifecycleCap>;
     provide: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Provide, import("@aalis/core").Provide>;
-    services: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Services, import("@aalis/core").Services>;
     commands: import("@aalis/core").OptionalUse<import("@aalis/api-commands").CommandService, import("@aalis/api-commands").BoundCommands>;
     tools: import("@aalis/core").OptionalUse<import("@aalis/api-tools").ToolService, import("@aalis/api-tools").BoundTools>;
-    llm: import("@aalis/core").OptionalUse<LLMModel, import("@aalis/core").ServiceRef<LLMModel>>;
-    memory: import("@aalis/core").OptionalUse<import("@aalis/api-memory").MemoryService, import("@aalis/core").ServiceRef<import("@aalis/api-memory").MemoryService>>;
-    persona: import("@aalis/core").OptionalUse<import("@aalis/api-persona").PersonaService, import("@aalis/core").ServiceRef<import("@aalis/api-persona").PersonaService>>;
-    messageArchive: import("@aalis/core").OptionalUse<import("@aalis/api-message-archive").MessageArchiveService, import("@aalis/core").ServiceRef<import("@aalis/api-message-archive").MessageArchiveService>>;
-    sessionManager: import("@aalis/core").OptionalUse<import("@aalis/api-session-manager").SessionManagerService, import("@aalis/core").ServiceRef<import("@aalis/api-session-manager").SessionManagerService>>;
-    platform: import("@aalis/core").OptionalUse<import("@aalis/api-platform").PlatformAdapter, import("@aalis/core").ServiceRef<import("@aalis/api-platform").PlatformAdapter>>;
-    media: import("@aalis/core").OptionalUse<import("@aalis/api-media").MediaService, import("@aalis/core").ServiceRef<import("@aalis/api-media").MediaService>>;
-    storage: import("@aalis/core").OptionalUse<import("@aalis/api-storage").StorageService, import("@aalis/core").ServiceRef<import("@aalis/api-storage").StorageService>>;
-    gateway: import("@aalis/core").OptionalUse<import("@aalis/api-gateway").GatewayService, import("@aalis/core").ServiceRef<import("@aalis/api-gateway").GatewayService>>;
-    plugins: import("@aalis/core").OptionalUse<import("@aalis/core").PluginManagerService, import("@aalis/core").ServiceRef<import("@aalis/core").PluginManagerService>>;
+    llm: import("@aalis/core").OptionalUse<LLMModel, LLMModel>;
+    memory: import("@aalis/core").OptionalUse<import("@aalis/api-memory").MemoryService, import("@aalis/api-memory").MemoryService>;
+    persona: import("@aalis/core").OptionalUse<import("@aalis/api-persona").PersonaService, import("@aalis/api-persona").PersonaService>;
+    messageArchive: import("@aalis/core").OptionalUse<import("@aalis/api-message-archive").MessageArchiveService, import("@aalis/api-message-archive").MessageArchiveService>;
+    sessionManager: import("@aalis/core").OptionalUse<SessionManagerService, import("@aalis/api-session-manager").BoundSessionManager>;
+    platform: import("@aalis/core").OptionalUse<import("@aalis/api-platform").PlatformAdapter, import("@aalis/api-platform").PlatformAdapter>;
+    media: import("@aalis/core").OptionalUse<import("@aalis/api-media").MediaService, import("@aalis/api-media").MediaService>;
+    storage: import("@aalis/core").OptionalUse<import("@aalis/api-storage").StorageService, import("@aalis/api-storage").BoundStorage>;
+    gateway: import("@aalis/core").OptionalUse<import("@aalis/api-gateway").GatewayService, import("@aalis/api-gateway").GatewayService>;
+    plugins: import("@aalis/core").OptionalUse<import("@aalis/core").PluginManagerService, import("@aalis/core").PluginManagerService>;
+    /** 会话没设模型时比对本插件该生效的 llm 偏好与实际用的模型 */
+    services: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Services, import("@aalis/core").Services>;
 }>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAkC,QAAQ,EAAiB,MAAM,gBAAgB,CAAC;AAe9F,OAAO,EAKL,KAAK,MAAM,EAOZ,MAAM,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;AA+wErB,wBAQG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAkC,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAO/F,OAAO,EAOL,KAAK,qBAAqB,EAG3B,MAAM,4BAA4B,CAAC;AAQpC,OAAO,EAKL,KAAK,MAAM,EAQZ,MAAM,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;IAoDnB,qCAAqC;;;AAmhFvC,wBAQG"}