cantian-ai 0.0.27 → 0.0.29

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export * from './Agent.js';
 export * from './mcp.js';
 export * from './message.js';
 export * from './models/index.js';

package/dist/index.js

@@ -1,4 +1,3 @@
-export * from './Agent.js';
 export * from './mcp.js';
 export * from './message.js';
 export * from './models/index.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC"}

package/dist/mcp.d.ts

@@ -1,5 +1,5 @@
 import { Client } from '@modelcontextprotocol/sdk/client';
-import { AgentTool } from './Agent.js';
+import { Tool } from './type.js';
 export declare const createMcpClient: (options: {
     url: string;
     authorization: string;
@@ -62,7 +62,7 @@ export declare const listTools: (client: Client) => Promise<{
             openWorldHint?: boolean | undefined;
         } | undefined;
         execution?: {
-            taskSupport?: "required" | "optional" | "forbidden" | undefined;
+            taskSupport?: "optional" | "required" | "forbidden" | undefined;
         } | undefined;
         _meta?: Record<string, unknown> | undefined;
         icons?: {
@@ -167,4 +167,4 @@ export declare const callTool: (client: Client, name: string, args: any) => Prom
 export declare const listAgentTools: (options: {
     url: string;
     authorization: string;
-}) => Promise<AgentTool[]>;
+}) => Promise<Tool[]>;

package/dist/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAGjG,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,OAA+C,EAAE,EAAE;IACvF,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;QAChE,WAAW,EAAE;YACX,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,aAAa,EAAE;aACzC;SACF;KACF,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CACnC;QACE,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,EAAE;KACX,EACD,qBAAqB,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAc,EAAE,IAAY,EAAE,IAAS,EAAE,EAAE;IACxE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CACnC;QACE,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE;YACN,IAAI;YACJ,SAAS,EAAE,IAAI;SAChB;KACF,EACD,oBAAoB,CACrB,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAA+C,EAAE,EAAE;IACtF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;IAChC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,KAAK,GAAgB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,UAAU,EAAE,CAAC,CAAC,WAAW;QACzB,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO;YACzB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;YAChC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClC,CAAC;YACD,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAGjG,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,OAA+C,EAAE,EAAE;IACvF,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;QAChE,WAAW,EAAE;YACX,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,aAAa,EAAE;aACzC;SACF;KACF,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IAChD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CACnC;QACE,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,EAAE;KACX,EACD,qBAAqB,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAc,EAAE,IAAY,EAAE,IAAS,EAAE,EAAE;IACxE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CACnC;QACE,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE;YACN,IAAI;YACJ,SAAS,EAAE,IAAI;SAChB;KACF,EACD,oBAAoB,CACrB,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAA+C,EAAE,EAAE;IACtF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;IAChC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,KAAK,GAAW,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,UAAU,EAAE,CAAC,CAAC,WAAW;QACzB,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO;YACzB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC;YAChC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClC,CAAC;YACD,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/dist/models/BaseModel.d.ts

@@ -1,28 +1,26 @@
 import { Semaphore } from 'async-mutex';
-import { JSONSchema } from 'json-schema-to-ts';
-import { InputItem, ModelChunk, ToolDefinition } from '../type.js';
+import { AgentChunk, InputItem, ModelChunk, Tool, UsageChunk } from '../type.js';
 export type Options = {
-    thinking?: {
-        type: 'enabled' | 'disabled' | 'auto';
-    };
-    reasoning?: {
-        effort: 'minimal' | 'low' | 'medium' | 'high';
-    };
-    temperature?: number;
-    tools?: ToolDefinition[];
+    tools?: Record<string, Tool>;
     signal?: AbortSignal;
-    textSchema?: JSONSchema;
+    finalRound?: boolean;
+    logMeta?: any;
 };
-export declare class BaseModel {
+export declare class BaseModel<T extends Options = Options> {
     url: string;
     apiKey: string;
     model: string;
-    options?: Options | undefined;
     semaphore: Semaphore;
-    constructor(url: string, apiKey: string, model: string, options?: Options | undefined);
-    stream(messages: InputItem[], options?: Options): AsyncGenerator<ModelChunk>;
-    invoke(messages: InputItem[], options?: Omit<Options, 'tools'>): Promise<{
+    constructor(url: string, apiKey: string, model: string);
+    stream(messages: InputItem[], options?: T): AsyncGenerator<ModelChunk>;
+    invoke(messages: InputItem[], options?: T): Promise<{
         message: string;
-        usage: any;
+        usage?: UsageChunk;
     }>;
+    agenticStream(messages: any[], modelOptions: Omit<T, 'signal' | 'logMeta'>, options?: {
+        signal?: AbortSignal;
+        maxRounds?: number;
+        context?: any;
+        logMeta?: any;
+    }): AsyncGenerator<AgentChunk>;
 }

package/dist/models/BaseModel.js

@@ -1,15 +1,16 @@
 import { Semaphore } from 'async-mutex';
+import { saveAgentUsage } from '../tokenUsage.js';
+import { executeTool, isAsyncGenerator } from '../util.js';
+const DEFAULT_MAX_ROUNDS = 10;
 export class BaseModel {
     url;
     apiKey;
     model;
-    options;
     semaphore;
-    constructor(url, apiKey, model, options) {
+    constructor(url, apiKey, model) {
         this.url = url;
         this.apiKey = apiKey;
         this.model = model;
-        this.options = options;
         this.semaphore = new Semaphore(10);
     }
     async *stream(messages, options) {
@@ -18,5 +19,99 @@ export class BaseModel {
     async invoke(messages, options) {
         throw new Error('Method not implemented.');
     }
+    async *agenticStream(messages, modelOptions, options) {
+        const input = [...messages];
+        let roundIndex = 0;
+        let toolCalls;
+        const maxRounds = options?.maxRounds || DEFAULT_MAX_ROUNDS;
+        const agentUsage = {
+            type: 'AGENT_USAGE',
+            model: this.model,
+            totalTokens: 0,
+            inputUsage: {
+                inputTokens: 0,
+                cachedTokens: 0,
+            },
+            outputUsage: {
+                outputTokens: 0,
+                reasoningTokens: 0,
+            },
+            firstTokenCostMs: 0,
+            totalCostMs: 0,
+            estimatedCost: 0,
+            rounds: [],
+        };
+        const startedTimestamp = Date.now();
+        do {
+            const response = this.stream(input, {
+                ...modelOptions,
+                finalRound: roundIndex === maxRounds - 1,
+                signal: options?.signal,
+            });
+            toolCalls = [];
+            for await (const chunk of response) {
+                switch (chunk.type) {
+                    case 'TOKEN':
+                    case 'MESSAGE':
+                    case 'MODEL_CALLING':
+                        yield chunk;
+                        break;
+                    case 'USAGE':
+                        agentUsage.totalTokens += chunk.totalTokens || 0;
+                        agentUsage.inputUsage.inputTokens += chunk.inputUsage.inputTokens || 0;
+                        agentUsage.inputUsage.cachedTokens += chunk.inputUsage.cachedTokens || 0;
+                        agentUsage.outputUsage.outputTokens += chunk.outputUsage.outputTokens || 0;
+                        agentUsage.outputUsage.reasoningTokens += chunk.outputUsage.reasoningTokens || 0;
+                        agentUsage.firstTokenCostMs = agentUsage.firstTokenCostMs || chunk.firstTokenCostMs;
+                        agentUsage.estimatedCost += chunk.estimatedCost;
+                        agentUsage.rounds.push({ input: chunk.input, output: chunk.output });
+                        yield chunk;
+                        break;
+                    case 'TOOL_CALL':
+                        toolCalls.push(chunk);
+                        input.push(chunk);
+                        yield chunk;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            let hasStreaming = false;
+            if (toolCalls.length) {
+                for (const toolCall of toolCalls) {
+                    yield { ...toolCall, type: 'TOOL_CALLING' };
+                    const { error, result, aiText } = await executeTool(toolCall, modelOptions.tools, options?.context);
+                    if (isAsyncGenerator(result)) {
+                        for await (const chunk of result) {
+                            yield { type: 'AGENTIC_TOOL_TOKEN', data: chunk };
+                        }
+                        hasStreaming = true;
+                    }
+                    else {
+                        const toolCallOutputChunk = {
+                            type: 'TOOL_CALL_OUTPUT',
+                            name: toolCall.name,
+                            callId: toolCall.callId,
+                            error,
+                            result: result,
+                            aiText,
+                        };
+                        input.push(toolCallOutputChunk);
+                        yield toolCallOutputChunk;
+                    }
+                }
+            }
+            roundIndex++;
+            // streaming的时候会正常推AI token给客户端展示，不应该再把结果返回给agent，会导致消息错乱
+            if (hasStreaming) {
+                break;
+            }
+        } while (toolCalls.length && roundIndex < maxRounds && !options?.signal?.aborted);
+        agentUsage.totalCostMs = Date.now() - startedTimestamp;
+        if (options?.logMeta) {
+            saveAgentUsage(agentUsage, options.logMeta);
+        }
+        yield agentUsage;
+    }
 }
 //# sourceMappingURL=BaseModel.js.map

package/dist/models/BaseModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/models/BaseModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAexC,MAAM,OAAO,SAAS;IAGD;IAAoB;IAAuB;IAAsB;IAF7E,SAAS,CAAY;IAE5B,YAAmB,GAAW,EAAS,MAAc,EAAS,KAAa,EAAS,OAAiB;QAAlF,QAAG,GAAH,GAAG,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAQ;QAAS,UAAK,GAAL,KAAK,CAAQ;QAAS,YAAO,GAAP,OAAO,CAAU;QACnG,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,CAAC,MAAM,CAAC,QAAqB,EAAE,OAAiB;QACpD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAqB,EAAE,OAAgC;QAClE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;CACF"}
+{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/models/BaseModel.ts"],"names":[],"mappings":"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"}

package/dist/models/DeepseekModel.d.ts

@@ -1,12 +1,23 @@
+import { JSONSchema } from 'json-schema-to-ts';
 import { InputItem, MessageChunk, ModelChunk, UsageChunk } from '../type.js';
 import { BaseModel, Options } from './BaseModel.js';
-export declare class DeepseekModel extends BaseModel {
-    stream(messages: InputItem[], options?: Options): AsyncGenerator<ModelChunk>;
-    invoke(input: MessageChunk[], options?: Omit<Options, 'tools'>): Promise<{
+type DeepseekModelOptions = {
+    thinking?: {
+        type: 'enabled' | 'disabled' | 'auto';
+    };
+    reasoning?: {
+        effort: 'minimal' | 'low' | 'medium' | 'high';
+    };
+    temperature?: number;
+    textSchema?: JSONSchema;
+} & Options;
+export declare class DeepseekModel extends BaseModel<DeepseekModelOptions> {
+    stream(messages: InputItem[], options?: DeepseekModelOptions): AsyncGenerator<ModelChunk>;
+    invoke(input: MessageChunk[], options?: DeepseekModelOptions): Promise<{
         message: string;
         usage: UsageChunk | undefined;
     }>;
-    protected buildResponseRequestParams(messages: InputItem[], options?: Options): [string, RequestInit];
+    protected buildResponseRequestParams(messages: InputItem[], options?: DeepseekModelOptions): [string, RequestInit];
     parseInputMessage: (message: InputItem) => MessageChunk | {
         type: string;
         call_id: string;
@@ -23,3 +34,4 @@ export declare class DeepseekModel extends BaseModel {
         output: any;
     };
 }
+export {};

package/dist/models/DeepseekModel.js

@@ -1,4 +1,5 @@
 import { sse } from 'cantian-request';
+import { saveModelUsage } from '../tokenUsage.js';
 import { BaseModel } from './BaseModel.js';
 const COST_DOLLAR_PER_M = 0.6;
 export class DeepseekModel extends BaseModel {
@@ -65,6 +66,9 @@ export class DeepseekModel extends BaseModel {
             }
             usageContent.totalCostMs = Date.now() - startedAt;
             usageContent.estimatedCost = (COST_DOLLAR_PER_M * (usageContent.totalTokens || 0)) / 1000000;
+            if (options?.logMeta) {
+                saveModelUsage(usageContent, options.logMeta);
+            }
             yield usageContent;
         }
         finally {
@@ -88,8 +92,8 @@ export class DeepseekModel extends BaseModel {
         return { message, usage };
     }
     buildResponseRequestParams(messages, options) {
-        let tools = options?.tools || this.options?.tools;
-        if (!tools?.length) {
+        let tools = options?.tools;
+        if (!tools || !Object.keys(tools).length || options?.finalRound) {
             tools = undefined;
         }
         return [
@@ -105,15 +109,17 @@ export class DeepseekModel extends BaseModel {
                     model: this.model,
                     input: messages.map(this.parseInputMessage),
                     stream: true,
-                    thinking: options?.thinking || this.options?.thinking,
-                    reasoning: options?.reasoning || this.options?.reasoning,
-                    temperature: options?.temperature || this.options?.temperature,
-                    tools: tools?.map((tool) => ({
-                        type: 'function',
-                        name: tool.name,
-                        description: tool.description,
-                        parameters: tool.parameters,
-                    })),
+                    thinking: options?.thinking,
+                    reasoning: options?.reasoning,
+                    temperature: options?.temperature,
+                    tools: tools
+                        ? Object.values(tools).map((tool) => ({
+                            type: 'function',
+                            name: tool.name,
+                            description: tool.description,
+                            parameters: tool.parameters,
+                        }))
+                        : undefined,
                     text: options?.textSchema && {
                         format: {
                             type: 'json_schema',

package/dist/models/DeepseekModel.js.map

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

package/dist/tokenUsage.d.ts

@@ -0,0 +1,3 @@
+import { AgentUsageChunk, UsageChunk } from './type.js';
+export declare const saveModelUsage: (usageChunk: UsageChunk, meta: any) => Promise<void>;
+export declare const saveAgentUsage: (agentUsageChunk: AgentUsageChunk, meta: any) => Promise<void>;

package/dist/tokenUsage.js

@@ -0,0 +1,38 @@
+import { mongoClient } from 'cantian-mongodb';
+const db = mongoClient.db('agent-service');
+const collection = db.collection('tokenUsages');
+export const saveModelUsage = async (usageChunk, meta) => {
+    const now = new Date().toISOString();
+    const tokenUsage = {
+        ...meta,
+        model: usageChunk.model,
+        totalTokens: usageChunk.totalTokens,
+        totalCostMs: usageChunk.totalCostMs,
+        rounds: [{ input: usageChunk.input, output: usageChunk.output }],
+        estimatedCost: usageChunk.estimatedCost,
+        inputUsage: usageChunk.inputUsage,
+        outputUsage: usageChunk.outputUsage,
+        createdAt: now,
+        updatedAt: now,
+    };
+    await collection.insertOne(tokenUsage);
+    console.log('Log done!');
+};
+export const saveAgentUsage = async (agentUsageChunk, meta) => {
+    const now = new Date().toISOString();
+    const tokenUsage = {
+        ...meta,
+        model: agentUsageChunk.model,
+        totalTokens: agentUsageChunk.totalTokens,
+        totalCostMs: agentUsageChunk.totalCostMs,
+        rounds: agentUsageChunk.rounds,
+        estimatedCost: agentUsageChunk.estimatedCost,
+        inputUsage: agentUsageChunk.inputUsage,
+        outputUsage: agentUsageChunk.outputUsage,
+        createdAt: now,
+        updatedAt: now,
+    };
+    await collection.insertOne(tokenUsage);
+    console.log('Log done!');
+};
+//# sourceMappingURL=tokenUsage.js.map

package/dist/tokenUsage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenUsage.js","sourceRoot":"","sources":["../src/tokenUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAwB9C,MAAM,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;AAC3C,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAa,aAAa,CAAC,CAAC;AAE5D,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,UAAsB,EAAE,IAAS,EAAE,EAAE;IACxE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,UAAU,GAAe;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC;QAChE,aAAa,EAAE,UAAU,CAAC,aAAa;QACvC,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACf,CAAC;IACF,MAAM,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,eAAgC,EAAE,IAAS,EAAE,EAAE;IAClF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,UAAU,GAAe;QAC7B,GAAG,IAAI;QACP,KAAK,EAAE,eAAe,CAAC,KAAK;QAC5B,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,aAAa,EAAE,eAAe,CAAC,aAAa;QAC5C,UAAU,EAAE,eAAe,CAAC,UAAU;QACtC,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;KACf,CAAC;IACF,MAAM,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3B,CAAC,CAAC"}

package/dist/type.d.ts

@@ -1,3 +1,4 @@
+import { ValidateFunction } from 'ajv';
 import { JSONSchema } from 'json-schema-to-ts';
 export type Role = 'user' | 'assistant' | 'system' | 'developer';
 export type MessageChunk = {
@@ -35,8 +36,13 @@ export type TokenChunk = {
     type: 'TOKEN';
     delta: string;
 };
+export type AgenticToolToken = {
+    type: 'AGENTIC_TOOL_TOKEN';
+    data: any;
+};
 export type UsageChunk = {
     type: 'USAGE';
+    model: string;
     totalTokens: number;
     inputUsage: {
         inputTokens: number;
@@ -55,6 +61,7 @@ export type UsageChunk = {
 export type AgentUsageChunk = {
     type: 'AGENT_USAGE';
     totalTokens: number;
+    model: string;
     inputUsage: {
         inputTokens: number;
         cachedTokens: number;
@@ -71,11 +78,14 @@ export type AgentUsageChunk = {
         output: any;
     }[];
 };
-export type ToolDefinition = {
+export type Tool<Context = any, Result = any> = {
     name: string;
     description?: string;
     parameters: JSONSchema;
+    handler: (args: any, context: Context) => Result | Promise<Result> | AsyncGenerator<AgenticToolToken>;
+    validate?: ValidateFunction;
+    toAiText?: (result: any, context: Context, args: any) => string | Promise<string>;
 };
 export type ModelChunk = ModelCallingChunk | TokenChunk | MessageChunk | ToolCallChunk | UsageChunk;
-export type AgentChunk = ModelChunk | ToolCallingChunk | ToolCallOutputChunk | AgentUsageChunk;
+export type AgentChunk = ModelChunk | AgenticToolToken | ToolCallingChunk | ToolCallOutputChunk | AgentUsageChunk;
 export {};

package/dist/util.d.ts

@@ -0,0 +1,7 @@
+import { Tool, ToolCallChunk } from './type.js';
+export declare const executeTool: (toolCall: ToolCallChunk, tools: Record<string, Tool>, context: any) => Promise<{
+    error?: any;
+    result?: any;
+    aiText?: string;
+}>;
+export declare function isAsyncGenerator(value: any): any;

package/dist/util.js

@@ -0,0 +1,36 @@
+export const executeTool = async (toolCall, tools, context) => {
+    const tool = tools[toolCall.name];
+    if (!tool) {
+        return { error: new Error('The tool name does not exist.') };
+    }
+    let json;
+    try {
+        json = JSON.parse(toolCall.arguments);
+    }
+    catch (error) {
+        return { error: new Error('The given <arguments> is an invalid JSON string.') };
+    }
+    try {
+        if (tool.validate) {
+            const valid = tool.validate(json);
+            if (!valid) {
+                return { error: new Error(`Invalid arguments: ${tool.validate.errors?.[0].message}`) };
+            }
+        }
+        const handlerResult = tool.handler(json, context);
+        const isAsyncGen = isAsyncGenerator(handlerResult);
+        if (isAsyncGen) {
+            return { result: handlerResult };
+        }
+        const result = await handlerResult;
+        const aiText = tool.toAiText ? await tool.toAiText(result, context, json) : undefined;
+        return { result, aiText };
+    }
+    catch (error) {
+        return { error };
+    }
+};
+export function isAsyncGenerator(value) {
+    return value && typeof value[Symbol.asyncIterator] === 'function';
+}
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,QAAuB,EACvB,KAA2B,EAC3B,OAAY,EAC6C,EAAE;IAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAAE,CAAC;IAC/D,CAAC;IACD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,kDAAkD,CAAC,EAAE,CAAC;IAClF,CAAC;IAED,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACzF,CAAC;QACH,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACnD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;QACnC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB,CAAC,KAAK;IACpC,OAAO,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,UAAU,CAAC;AACpE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cantian-ai",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "exports": {
     ".": "./dist/index.js"
@@ -15,6 +15,8 @@
     "@modelcontextprotocol/sdk": "^1.25.1",
     "ajv": "^8.17.1",
     "async-mutex": "^0.5.0",
+    "cantian-als": "*",
+    "cantian-mongodb": "*",
     "cantian-request": "*"
   },
   "devDependencies": {

package/dist/Agent.d.ts

@@ -1,32 +0,0 @@
-import { ValidateFunction } from 'ajv';
-import { JSONSchema } from 'json-schema-to-ts';
-import { BaseModel } from './models/BaseModel.js';
-import { AgentChunk, ToolCallChunk } from './type.js';
-export type AgentTool<Context = any, Result = any> = {
-    name: string;
-    description?: string;
-    parameters: JSONSchema;
-    handler: (args: any, context: Context) => Result | Promise<Result>;
-    toAiText?: (result: any, context: Context, args: any) => string | Promise<string>;
-};
-export declare class Agent {
-    toolMap: Record<string, AgentTool & {
-        validate: ValidateFunction;
-    }>;
-    model: BaseModel;
-    constructor(options: {
-        model: BaseModel;
-        tools: AgentTool[];
-    });
-    stream(messages: any[], options?: {
-        signal?: AbortSignal;
-        maxRounds?: number;
-        context?: any;
-        temperature?: number;
-    }): AsyncGenerator<AgentChunk>;
-    executeTool(toolCall: ToolCallChunk, context: any): Promise<{
-        error?: any;
-        result?: any;
-        aiText?: string;
-    }>;
-}

package/dist/Agent.js

@@ -1,127 +0,0 @@
-import Ajv from 'ajv';
-const ajv = new Ajv.default({ removeAdditional: true, useDefaults: true });
-const DEFAULT_MAX_ROUNDS = 5;
-export class Agent {
-    toolMap = {};
-    model;
-    constructor(options) {
-        this.model = options.model;
-        for (const tool of options.tools) {
-            this.toolMap[tool.name] = {
-                ...tool,
-                validate: ajv.compile(tool.parameters),
-            };
-        }
-    }
-    async *stream(messages, options) {
-        const input = [...messages];
-        let roundIndex = 0;
-        let toolCalls;
-        const toolDefinitions = Object.values(this.toolMap).map((t) => ({
-            name: t.name,
-            description: t.description,
-            parameters: t.parameters,
-        }));
-        const maxRounds = options?.maxRounds || DEFAULT_MAX_ROUNDS;
-        const agentUsage = {
-            type: 'AGENT_USAGE',
-            totalTokens: 0,
-            inputUsage: {
-                inputTokens: 0,
-                cachedTokens: 0,
-            },
-            outputUsage: {
-                outputTokens: 0,
-                reasoningTokens: 0,
-            },
-            firstTokenCostMs: 0,
-            totalCostMs: 0,
-            estimatedCost: 0,
-            rounds: [],
-        };
-        const startedTimestamp = Date.now();
-        do {
-            const response = this.model.stream(input, {
-                tools: roundIndex < maxRounds - 1 ? toolDefinitions : undefined,
-                signal: options?.signal,
-                temperature: options?.temperature,
-            });
-            toolCalls = [];
-            for await (const chunk of response) {
-                switch (chunk.type) {
-                    case 'TOKEN':
-                    case 'MESSAGE':
-                    case 'MODEL_CALLING':
-                        yield chunk;
-                        break;
-                    case 'USAGE':
-                        agentUsage.totalTokens += chunk.totalTokens || 0;
-                        agentUsage.inputUsage.inputTokens += chunk.inputUsage.inputTokens || 0;
-                        agentUsage.inputUsage.cachedTokens += chunk.inputUsage.cachedTokens || 0;
-                        agentUsage.outputUsage.outputTokens += chunk.outputUsage.outputTokens || 0;
-                        agentUsage.outputUsage.reasoningTokens += chunk.outputUsage.reasoningTokens || 0;
-                        agentUsage.firstTokenCostMs = agentUsage.firstTokenCostMs || chunk.firstTokenCostMs;
-                        agentUsage.estimatedCost += chunk.estimatedCost;
-                        agentUsage.rounds.push({ input: chunk.input, output: chunk.output });
-                        yield chunk;
-                        break;
-                    case 'TOOL_CALL':
-                        toolCalls.push(chunk);
-                        input.push(chunk);
-                        yield chunk;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            if (toolCalls.length) {
-                for (const toolCall of toolCalls) {
-                    yield { ...toolCall, type: 'TOOL_CALLING' };
-                    const { error, result, aiText } = await this.executeTool(toolCall, options?.context);
-                    const toolCallOutputChunk = {
-                        type: 'TOOL_CALL_OUTPUT',
-                        name: toolCall.name,
-                        callId: toolCall.callId,
-                        error,
-                        result: result,
-                        aiText,
-                    };
-                    input.push(toolCallOutputChunk);
-                    yield toolCallOutputChunk;
-                }
-            }
-            roundIndex++;
-        } while (toolCalls.length && roundIndex < maxRounds && !options?.signal?.aborted);
-        agentUsage.totalCostMs = Date.now() - startedTimestamp;
-        yield agentUsage;
-    }
-    async executeTool(toolCall, context) {
-        const tool = this.toolMap[toolCall.name];
-        if (!tool) {
-            return { error: new Error('The tool name does not exist.') };
-        }
-        let json;
-        try {
-            json = JSON.parse(toolCall.arguments);
-        }
-        catch (error) {
-            return { error: new Error('The given <arguments> is an invalid JSON string.') };
-        }
-        try {
-            const valid = tool.validate(json);
-            if (!valid) {
-                return { error: new Error(`Invalid arguments: ${tool.validate.errors?.[0].message}`) };
-            }
-            const result = await tool.handler(json, context);
-            let aiText;
-            if (tool.toAiText) {
-                aiText = await tool.toAiText(result, context, json);
-            }
-            return { result, aiText };
-        }
-        catch (error) {
-            return { error };
-        }
-    }
-}
-//# sourceMappingURL=Agent.js.map

package/dist/Agent.js.map

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