@agentscope-ai/agentscope 0.0.5 → 0.0.6

package/dist/storage/index.d.mts

@@ -1,5 +1,5 @@
-import { S as StorageBase, A as AgentState } from '../base-BB9eTlit.mjs';
-import { M as Msg } from '../message-D-LObC06.mjs';
+import { S as StorageBase, A as AgentState } from '../base-Ps8E0j1_.mjs';
+import { M as Msg } from '../message-COpNEf0G.mjs';
 import '../index-CAxQAkiP.mjs';
 import '../block-BqWf-Qcb.mjs';
 import '../event/index.mjs';

package/dist/storage/index.d.ts

@@ -1,5 +1,5 @@
-import { S as StorageBase, A as AgentState } from '../base-DHtZCg94.js';
-import { M as Msg } from '../message-DU0_qm3u.js';
+import { S as StorageBase, A as AgentState } from '../base-CJkm56kB.js';
+import { M as Msg } from '../message-DbCMy5tM.js';
 import '../index-CAxQAkiP.js';
 import '../block-BqWf-Qcb.js';
 import '../event/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentscope-ai/agentscope",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "exports": {
     "./message": {

package/src/agent/agent.ts

@@ -261,26 +261,39 @@ export class Agent {
      * @param usage
      */
     protected _saveToContext(blocks: ContentBlock[], usage?: ChatUsage): void {
+        const msgUsage: Msg['usage'] = usage
+            ? { input_tokens: usage.inputTokens, output_tokens: usage.outputTokens }
+            : undefined;
         const lastMsg = this.context.at(-1);
         if (this.context.length === 0) {
             this.context.push(
-                createMsg({ name: this.name, content: blocks, role: 'assistant', usage })
+                createMsg({
+                    name: this.name,
+                    content: blocks,
+                    role: 'assistant',
+                    usage: msgUsage,
+                })
             );
         } else if (lastMsg && lastMsg.role === 'assistant' && lastMsg.name === this.name) {
             lastMsg.content.push(...blocks);
-            if (usage) {
+            if (msgUsage) {
                 if (!lastMsg.usage) {
                     lastMsg.usage = {
-                        inputTokens: 0,
-                        outputTokens: 0,
+                        input_tokens: 0,
+                        output_tokens: 0,
                     };
                 }
-                lastMsg.usage.inputTokens = lastMsg.usage.inputTokens + usage.inputTokens;
-                lastMsg.usage.outputTokens = lastMsg.usage.outputTokens + usage.outputTokens;
+                lastMsg.usage.input_tokens = lastMsg.usage.input_tokens + msgUsage.input_tokens;
+                lastMsg.usage.output_tokens = lastMsg.usage.output_tokens + msgUsage.output_tokens;
             }
         } else {
             this.context.push(
-                createMsg({ name: this.name, content: blocks, role: 'assistant', usage })
+                createMsg({
+                    name: this.name,
+                    content: blocks,
+                    role: 'assistant',
+                    usage: msgUsage,
+                })
             );
         }
     }

package/src/event/index.ts

@@ -160,7 +160,6 @@ export interface ToolResultTextDeltaEvent extends EventBase {
     type: EventType.TOOL_RESULT_TEXT_DELTA;
     reply_id: string;
     tool_call_id: string;
-    block_id: string;
     delta: string;
 }
 
@@ -168,7 +167,8 @@ export interface ToolResultDataDeltaEvent extends EventBase {
     type: EventType.TOOL_RESULT_DATA_DELTA;
     reply_id: string;
     tool_call_id: string;
-    block_id: string;
+    /** Auto-generated in {@link appendEvent} when not provided. */
+    block_id?: string;
     media_type: string;
     data?: string;
     url?: string;

package/src/message/append-event.test.ts

@@ -8,6 +8,7 @@ import {
     ToolCallBlock,
     ToolResultBlock,
 } from './block';
+import { PermissionRule } from '../permission';
 
 // Fixed IDs used throughout
 const REPLY_ID = 'reply_001';
@@ -84,15 +85,19 @@ function dbUrl(blockId: string, url: string, mediaType: string): DataBlock {
  * @param name
  * @param inp
  * @param state
+ * @param suggestedRules
  * @returns A tool call block object.
  */
 function tcb(
     tcId: string,
     name: string,
     inp: string,
-    state: ToolCallBlock['state']
+    state: ToolCallBlock['state'],
+    suggestedRules?: PermissionRule[]
 ): ToolCallBlock {
-    return { type: 'tool_call', id: tcId, name, input: inp, state };
+    const block: ToolCallBlock = { type: 'tool_call', id: tcId, name, input: inp, state };
+    if (suggestedRules !== undefined) block.suggested_rules = suggestedRules;
+    return block;
 }
 
 /**
@@ -370,7 +375,9 @@ describe('appendEvent', () => {
             reply_id: REPLY_ID,
             tool_calls: [tcAllowBlock],
         });
-        groundTruths.push(base([...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'asking')]));
+        groundTruths.push(
+            base([...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'asking', [])])
+        );
 
         // UserConfirmResultEvent (confirmed=true) → state: asking → allowed
         events.push({
@@ -380,7 +387,9 @@ describe('appendEvent', () => {
             reply_id: REPLY_ID,
             confirm_results: [{ confirmed: true, tool_call: tcAllowBlock }],
         });
-        groundTruths.push(base([...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'allowed')]));
+        groundTruths.push(
+            base([...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'allowed', [])])
+        );
 
         // ToolResult for TC_ALLOW - text output
         events.push({
@@ -391,7 +400,7 @@ describe('appendEvent', () => {
             tool_call_id: TC_ALLOW,
             tool_call_name: 'search',
         });
-        const s4bPrefix = [...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'allowed')];
+        const s4bPrefix = [...s4Prefix, tcb(TC_ALLOW, 'search', '{"q": "hi"}', 'allowed', [])];
         groundTruths.push(base([...s4bPrefix, trb(TC_ALLOW, 'search', [], 'running')]));
 
         // ToolResult text deltas
@@ -401,7 +410,6 @@ describe('appendEvent', () => {
             type: EventType.TOOL_RESULT_TEXT_DELTA,
             reply_id: REPLY_ID,
             tool_call_id: TC_ALLOW,
-            block_id: 'auto_1',
             delta: 'Found:',
         });
         groundTruths.push(
@@ -422,7 +430,6 @@ describe('appendEvent', () => {
             type: EventType.TOOL_RESULT_TEXT_DELTA,
             reply_id: REPLY_ID,
             tool_call_id: TC_ALLOW,
-            block_id: 'auto_1',
             delta: ' 3 items',
         });
         groundTruths.push(
@@ -501,7 +508,7 @@ describe('appendEvent', () => {
             reply_id: REPLY_ID,
             tool_calls: [tcDenyBlock],
         });
-        groundTruths.push(base([...s5Prefix, tcb(TC_DENY, 'delete', '', 'asking')]));
+        groundTruths.push(base([...s5Prefix, tcb(TC_DENY, 'delete', '', 'asking', [])]));
 
         events.push({
             id: '26',
@@ -510,10 +517,10 @@ describe('appendEvent', () => {
             reply_id: REPLY_ID,
             confirm_results: [{ confirmed: false, tool_call: tcDenyBlock }],
         });
-        groundTruths.push(base([...s5Prefix, tcb(TC_DENY, 'delete', '', 'finished')]));
+        groundTruths.push(base([...s5Prefix, tcb(TC_DENY, 'delete', '', 'finished', [])]));
 
         // Stage 6: ToolCall (TC_EXT) → external execution
-        const s6Prefix = [...s5Prefix, tcb(TC_DENY, 'delete', '', 'finished')];
+        const s6Prefix = [...s5Prefix, tcb(TC_DENY, 'delete', '', 'finished', [])];
 
         events.push({
             id: '27',
@@ -753,7 +760,6 @@ describe('appendEvent', () => {
                 type: EventType.TOOL_RESULT_TEXT_DELTA,
                 reply_id: REPLY_ID,
                 tool_call_id: 'ghost',
-                block_id: 'b',
                 delta: 'x',
             },
             {

package/src/message/message.test.ts

@@ -27,8 +27,8 @@ describe('Message', () => {
 
     test('obtain different content from message', () => {
         const msg = createMsg({
-            name: 'user',
-            role: 'user',
+            name: 'assistant',
+            role: 'assistant',
             content: [
                 { id: crypto.randomUUID(), type: 'text', text: 'Hello' },
                 { id: crypto.randomUUID(), type: 'thinking', thinking: '...' },

package/src/message/message.ts

@@ -29,8 +29,8 @@ export interface Msg {
     finished_at?: string | null;
     /** Usage information for the message, such as token counts. */
     usage?: {
-        inputTokens: number;
-        outputTokens: number;
+        input_tokens: number;
+        output_tokens: number;
     };
 }
 
@@ -48,6 +48,44 @@ export interface Msg {
  * @param root0.usage
  * @returns A Msg object.
  */
+/**
+ * Validate that content blocks are allowed for the given role.
+ *
+ * Mirrors the Python `_assert_user_content_blocks` / `_assert_system_content_blocks`
+ * guards: user messages may only contain text or data blocks; system messages
+ * may only contain text blocks; assistant messages accept any block type.
+ * @param role
+ * @param content
+ */
+function assertContentBlocksForRole(role: Msg['role'], content: ContentBlock[]): void {
+    if (role === 'user') {
+        for (const block of content) {
+            if (block.type !== 'text' && block.type !== 'data') {
+                throw new Error('User message can only contain text blocks or data blocks.');
+            }
+        }
+    } else if (role === 'system') {
+        for (const block of content) {
+            if (block.type !== 'text') {
+                throw new Error('System message can only contain text blocks.');
+            }
+        }
+    }
+}
+
+/**
+ * createMsg is a low-level utility for constructing Msg objects with proper defaults and validation.
+ * @param root0
+ * @param root0.name
+ * @param root0.content
+ * @param root0.role
+ * @param root0.metadata
+ * @param root0.id
+ * @param root0.created_at
+ * @param root0.finished_at
+ * @param root0.usage
+ * @returns A Msg object with the specified properties, and defaults for any omitted fields.
+ */
 export function createMsg({
     name,
     content,
@@ -65,6 +103,7 @@ export function createMsg({
         typeof content === 'string'
             ? [{ id: crypto.randomUUID(), type: 'text', text: content } as TextBlock]
             : content;
+    assertContentBlocksForRole(role, contentBlocks);
     return { id, name, role, content: contentBlocks, metadata, created_at, finished_at, usage };
 }
 
@@ -76,6 +115,7 @@ export function createMsg({
  * @param root0.metadata
  * @param root0.id
  * @param root0.created_at
+ * @param root0.finished_at
  * @returns A Msg object with role 'user'.
  */
 export function UserMsg({
@@ -84,14 +124,24 @@ export function UserMsg({
     metadata = {},
     id = crypto.randomUUID(),
     created_at = new Date().toISOString(),
+    finished_at,
 }: {
     name: string;
     content: string | ContentBlock[];
     metadata?: Record<string, JSONSerializableObject>;
     id?: string;
     created_at?: string;
+    finished_at?: string | null;
 }): Msg {
-    return createMsg({ name, content, role: 'user', metadata, id, created_at });
+    return createMsg({
+        name,
+        content,
+        role: 'user',
+        metadata,
+        id,
+        created_at,
+        finished_at: finished_at ?? created_at,
+    });
 }
 
 /**
@@ -131,6 +181,7 @@ export function AssistantMsg({
  * @param root0.metadata
  * @param root0.id
  * @param root0.created_at
+ * @param root0.finished_at
  * @returns A Msg object with role 'system'.
  */
 export function SystemMsg({
@@ -139,14 +190,24 @@ export function SystemMsg({
     metadata = {},
     id = crypto.randomUUID(),
     created_at = new Date().toISOString(),
+    finished_at,
 }: {
     name: string;
     content: string | ContentBlock[];
     metadata?: Record<string, JSONSerializableObject>;
     id?: string;
     created_at?: string;
+    finished_at?: string | null;
 }): Msg {
-    return createMsg({ name, content, role: 'system', metadata, id, created_at });
+    return createMsg({
+        name,
+        content,
+        role: 'system',
+        metadata,
+        id,
+        created_at,
+        finished_at: finished_at ?? created_at,
+    });
 }
 
 /**
@@ -267,7 +328,7 @@ export function appendEvent(msg: Msg, event: AgentEvent): Msg {
             const block = findBlock(msg, 'data', event.block_id);
             if (!block) {
                 console.warn(`DataBlock "${event.block_id}" not found, skipping.`);
-            } else {
+            } else if (event.data) {
                 ((block as DataBlock).source as Base64Source).data += event.data;
             }
             break;
@@ -322,7 +383,7 @@ export function appendEvent(msg: Msg, event: AgentEvent): Msg {
                 if (!last || last.type !== 'text') {
                     trb.output.push({
                         type: 'text',
-                        id: event.block_id ?? crypto.randomUUID(),
+                        id: crypto.randomUUID(),
                         text: event.delta,
                     });
                 } else {
@@ -345,7 +406,11 @@ export function appendEvent(msg: Msg, event: AgentEvent): Msg {
                     event.data != null
                         ? { type: 'base64', data: event.data, media_type: event.media_type }
                         : { type: 'url', url: event.url!, media_type: event.media_type };
-                trb.output.push({ type: 'data', id: event.block_id, source });
+                trb.output.push({
+                    type: 'data',
+                    id: event.block_id ?? crypto.randomUUID(),
+                    source,
+                });
             }
             break;
         }
@@ -363,12 +428,12 @@ export function appendEvent(msg: Msg, event: AgentEvent): Msg {
         case EventType.MODEL_CALL_END:
             // Accumulated the input and output tokens here.
             if (msg.usage) {
-                msg.usage.inputTokens += event.input_tokens;
-                msg.usage.outputTokens += event.output_tokens;
+                msg.usage.input_tokens += event.input_tokens;
+                msg.usage.output_tokens += event.output_tokens;
             } else {
                 msg.usage = {
-                    inputTokens: event.input_tokens,
-                    outputTokens: event.output_tokens,
+                    input_tokens: event.input_tokens,
+                    output_tokens: event.output_tokens,
                 };
             }
             break;
@@ -378,9 +443,7 @@ export function appendEvent(msg: Msg, event: AgentEvent): Msg {
                 const b = findBlock(msg, 'tool_call', tc.id);
                 if (b) {
                     (b as ToolCallBlock).state = 'asking';
-                    if (tc.suggested_rules !== undefined) {
-                        (b as ToolCallBlock).suggested_rules = tc.suggested_rules;
-                    }
+                    (b as ToolCallBlock).suggested_rules = tc.suggested_rules || [];
                 }
             }
             break;