@agentscope-ai/agentscope 0.0.3 → 0.0.4

package/dist/storage/index.d.mts

@@ -1,7 +1,8 @@
-import { S as StorageBase, A as AgentState } from '../base-Dh5vEBQD.mjs';
-import { M as Msg } from '../message-CYnHiEVt.mjs';
+import { S as StorageBase, A as AgentState } from '../base-ClilytRZ.mjs';
+import { M as Msg } from '../message-DgpfAaHK.mjs';
 import '../index-CAxQAkiP.mjs';
-import '../block-7fd6byyN.mjs';
+import '../block-B72uPF1H.mjs';
+import '../event/index.mjs';
 
 /**
  * Local file system storage implementation.

package/dist/storage/index.d.ts

@@ -1,7 +1,8 @@
-import { S as StorageBase, A as AgentState } from '../base-Co-MzdN5.js';
-import { M as Msg } from '../message-DZN7LetB.js';
+import { S as StorageBase, A as AgentState } from '../base-CY4DMBH1.js';
+import { M as Msg } from '../message-CPZd0NIc.js';
 import '../index-CAxQAkiP.js';
-import '../block-7fd6byyN.js';
+import '../block-B72uPF1H.js';
+import '../event/index.js';
 
 /**
  * Local file system storage implementation.

package/dist/tool/index.d.mts

@@ -1,13 +1,13 @@
-import { a as ToolResponse } from '../index-BVNbIN62.mjs';
-export { T as Tool } from '../index-BVNbIN62.mjs';
-export { T as Toolkit } from '../toolkit-CH9qKAy9.mjs';
+import { a as ToolResponse } from '../index-UQCwdfet.mjs';
+export { T as Tool } from '../index-UQCwdfet.mjs';
+export { T as Toolkit } from '../toolkit-jwe7NmVJ.mjs';
 import { z } from 'zod';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
 import '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import '@modelcontextprotocol/sdk/shared/protocol.js';
 import '../index-CAxQAkiP.mjs';
-import '../block-7fd6byyN.mjs';
+import '../block-B72uPF1H.mjs';
 import '@modelcontextprotocol/sdk/client/stdio.js';
 
 /**

package/dist/tool/index.d.ts

@@ -1,13 +1,13 @@
-import { a as ToolResponse } from '../index-DaopL-Vp.js';
-export { T as Tool } from '../index-DaopL-Vp.js';
-export { T as Toolkit } from '../toolkit-BuMTkbGg.js';
+import { a as ToolResponse } from '../index-BNfyKbQN.js';
+export { T as Tool } from '../index-BNfyKbQN.js';
+export { T as Toolkit } from '../toolkit-DeOlul5Y.js';
 import { z } from 'zod';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/sse.js';
 import '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import '@modelcontextprotocol/sdk/shared/protocol.js';
 import '../index-CAxQAkiP.js';
-import '../block-7fd6byyN.js';
+import '../block-B72uPF1H.js';
 import '@modelcontextprotocol/sdk/client/stdio.js';
 
 /**

package/dist/{toolkit-BuMTkbGg.d.ts → toolkit-DeOlul5Y.d.ts}

@@ -1,6 +1,6 @@
-import { T as Tool, H as HTTPMCPClient, S as StdioMCPClient, a as ToolResponse } from './index-DaopL-Vp.js';
+import { T as Tool, H as HTTPMCPClient, S as StdioMCPClient, a as ToolResponse } from './index-BNfyKbQN.js';
 import { T as ToolSchema } from './index-CAxQAkiP.js';
-import { b as ToolCallBlock } from './block-7fd6byyN.js';
+import { b as ToolCallBlock } from './block-B72uPF1H.js';
 
 interface RegisteredTool extends Tool {
     type: 'function' | 'mcp';

package/dist/{toolkit-CH9qKAy9.d.mts → toolkit-jwe7NmVJ.d.mts}

@@ -1,6 +1,6 @@
-import { T as Tool, H as HTTPMCPClient, S as StdioMCPClient, a as ToolResponse } from './index-BVNbIN62.mjs';
+import { T as Tool, H as HTTPMCPClient, S as StdioMCPClient, a as ToolResponse } from './index-UQCwdfet.mjs';
 import { T as ToolSchema } from './index-CAxQAkiP.mjs';
-import { b as ToolCallBlock } from './block-7fd6byyN.mjs';
+import { b as ToolCallBlock } from './block-B72uPF1H.mjs';
 
 interface RegisteredTool extends Tool {
     type: 'function' | 'mcp';

package/package.json

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

package/src/agent/agent.test.ts

@@ -76,12 +76,14 @@ describe('Human-in-the-loop', () => {
                 id: '1',
                 name: 'Bash',
                 input: `{"command": "echo Hello"}`,
+                state: 'pending',
             },
             {
                 type: 'tool_call',
                 id: '2',
                 name: 'Bash',
                 input: `{"command": "echo World"}`,
+                state: 'pending',
             },
         ];
 
@@ -99,14 +101,14 @@ describe('Human-in-the-loop', () => {
                     id: '1',
                     name: 'Bash',
                     input: '{"command": "echo Hello"}',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
                 {
                     type: 'tool_call',
                     id: '2',
                     name: 'Bash',
                     input: '{"command": "echo World"}',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
             ],
         });
@@ -126,14 +128,14 @@ describe('Human-in-the-loop', () => {
                         input: '{"command": "echo Hello"}',
                         name: 'Bash',
                         type: 'tool_call',
-                        awaitUserConfirmation: true,
+                        state: 'asking',
                     },
                     {
                         id: '2',
                         input: '{"command": "echo World"}',
                         name: 'Bash',
                         type: 'tool_call',
-                        awaitUserConfirmation: true,
+                        state: 'asking',
                     },
                 ],
                 id: expect.any(String),
@@ -159,6 +161,7 @@ describe('Human-in-the-loop', () => {
                             id: '1',
                             name: 'Bash',
                             input: '{"command": "echo Hello"}',
+                            state: 'pending',
                         },
                     },
                 ],
@@ -177,6 +180,7 @@ describe('Human-in-the-loop', () => {
                     id: '2',
                     name: 'Bash',
                     input: '{"command": "echo World"}',
+                    state: 'asking',
                 },
             ],
         });
@@ -189,13 +193,14 @@ describe('Human-in-the-loop', () => {
                     input: '{"command": "echo Hello"}',
                     name: 'Bash',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
                 {
                     id: '2',
                     input: '{"command": "echo World"}',
                     name: 'Bash',
                     type: 'tool_call',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
                 {
                     id: '1',
@@ -230,6 +235,7 @@ describe('Human-in-the-loop', () => {
                             id: '2',
                             name: 'Bash',
                             input: '{"command": "echo World"}',
+                            state: 'pending',
                         },
                     },
                 ],
@@ -312,12 +318,14 @@ describe('Human-in-the-loop', () => {
                 id: '1',
                 name: 'ExternalTool1',
                 input: `{"query": "test query"}`,
+                state: 'pending',
             },
             {
                 type: 'tool_call',
                 id: '2',
                 name: 'ExternalTool2',
                 input: `{"data": "test data"}`,
+                state: 'pending',
             },
         ];
 
@@ -336,12 +344,14 @@ describe('Human-in-the-loop', () => {
                     id: '1',
                     name: 'ExternalTool1',
                     input: '{"query": "test query"}',
+                    state: 'pending',
                 },
                 {
                     type: 'tool_call',
                     id: '2',
                     name: 'ExternalTool2',
                     input: '{"data": "test data"}',
+                    state: 'pending',
                 },
             ],
         });
@@ -362,12 +372,14 @@ describe('Human-in-the-loop', () => {
                         input: '{"query": "test query"}',
                         name: 'ExternalTool1',
                         type: 'tool_call',
+                        state: 'pending',
                     },
                     {
                         id: '2',
                         input: '{"data": "test data"}',
                         name: 'ExternalTool2',
                         type: 'tool_call',
+                        state: 'pending',
                     },
                 ],
                 id: expect.any(String),
@@ -375,6 +387,7 @@ describe('Human-in-the-loop', () => {
                 name: 'Friday',
                 role: 'assistant',
                 created_at: expect.any(String),
+                finished_at: undefined,
             },
         ]);
 
@@ -415,6 +428,7 @@ describe('Human-in-the-loop', () => {
                     id: '2',
                     name: 'ExternalTool2',
                     input: '{"data": "test data"}',
+                    state: 'pending',
                 },
             ],
         });
@@ -427,12 +441,14 @@ describe('Human-in-the-loop', () => {
                     input: '{"query": "test query"}',
                     name: 'ExternalTool1',
                     type: 'tool_call',
+                    state: 'pending',
                 },
                 {
                     id: '2',
                     input: '{"data": "test data"}',
                     name: 'ExternalTool2',
                     type: 'tool_call',
+                    state: 'pending',
                 },
                 {
                     id: '1',
@@ -578,18 +594,21 @@ describe('Human-in-the-loop', () => {
                 id: '1',
                 name: 'ExternalTool',
                 input: `{"query": "external query"}`,
+                state: 'pending',
             },
             {
                 type: 'tool_call',
                 id: '2',
                 name: 'ConfirmTool',
                 input: `{"action": "delete file"}`,
+                state: 'pending',
             },
             {
                 type: 'tool_call',
                 id: '3',
                 name: 'NormalTool',
                 input: `{"data": "normal data"}`,
+                state: 'pending',
             },
         ];
 
@@ -608,6 +627,7 @@ describe('Human-in-the-loop', () => {
                     id: '1',
                     name: 'ExternalTool',
                     input: '{"query": "external query"}',
+                    state: 'pending',
                 },
             ],
         });
@@ -656,7 +676,7 @@ describe('Human-in-the-loop', () => {
                     id: '2',
                     name: 'ConfirmTool',
                     input: '{"action": "delete file"}',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
             ],
         });
@@ -692,6 +712,7 @@ describe('Human-in-the-loop', () => {
                             id: '2',
                             name: 'ConfirmTool',
                             input: '{"action": "delete file"}',
+                            state: 'pending',
                         },
                     },
                 ],
@@ -716,18 +737,21 @@ describe('Human-in-the-loop', () => {
                     input: '{"query": "external query"}',
                     name: 'ExternalTool',
                     type: 'tool_call',
+                    state: 'pending',
                 },
                 {
                     id: '2',
                     input: '{"action": "delete file"}',
                     name: 'ConfirmTool',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
                 {
                     id: '3',
                     input: '{"data": "normal data"}',
                     name: 'NormalTool',
                     type: 'tool_call',
+                    state: 'pending',
                 },
                 {
                     id: '1',
@@ -823,12 +847,14 @@ describe('Human-in-the-loop', () => {
                 id: '1',
                 name: 'ExternalAndConfirmTool',
                 input: `{"command": "rm -rf /"}`,
+                state: 'pending',
             },
             {
                 type: 'tool_call',
                 id: '2',
                 name: 'ConfirmOnlyTool',
                 input: `{"action": "delete database"}`,
+                state: 'pending',
             },
         ];
 
@@ -847,14 +873,14 @@ describe('Human-in-the-loop', () => {
                     id: '1',
                     name: 'ExternalAndConfirmTool',
                     input: '{"command": "rm -rf /"}',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
                 {
                     type: 'tool_call',
                     id: '2',
                     name: 'ConfirmOnlyTool',
                     input: '{"action": "delete database"}',
-                    awaitUserConfirmation: true,
+                    state: 'asking',
                 },
             ],
         });
@@ -881,6 +907,7 @@ describe('Human-in-the-loop', () => {
                             id: '1',
                             name: 'ExternalAndConfirmTool',
                             input: '{"command": "rm -rf /"}',
+                            state: 'pending',
                         },
                     },
                     {
@@ -890,6 +917,7 @@ describe('Human-in-the-loop', () => {
                             id: '2',
                             name: 'ConfirmOnlyTool',
                             input: '{"action": "delete database"}',
+                            state: 'pending',
                         },
                     },
                 ],
@@ -908,6 +936,7 @@ describe('Human-in-the-loop', () => {
                     id: '1',
                     name: 'ExternalAndConfirmTool',
                     input: '{"command": "rm -rf /"}',
+                    state: 'allowed',
                 },
             ],
         });
@@ -927,12 +956,14 @@ describe('Human-in-the-loop', () => {
                     input: '{"command": "rm -rf /"}',
                     name: 'ExternalAndConfirmTool',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
                 {
                     id: '2',
                     input: '{"action": "delete database"}',
                     name: 'ConfirmOnlyTool',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
             ],
         ]);
@@ -984,12 +1015,14 @@ describe('Human-in-the-loop', () => {
                     input: '{"command": "rm -rf /"}',
                     name: 'ExternalAndConfirmTool',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
                 {
                     id: '2',
                     input: '{"action": "delete database"}',
                     name: 'ConfirmOnlyTool',
                     type: 'tool_call',
+                    state: 'allowed',
                 },
                 {
                     id: '1',

package/src/agent/agent.ts

@@ -194,7 +194,7 @@ export class Agent {
             agentId: this.name,
             context: this.context,
             metadata: {
-                reply_id: this.replyId,
+                replyId: this.replyId,
                 curIter: this.curIter,
                 curSummary: this.curSummary,
             },
@@ -322,7 +322,7 @@ export class Agent {
                 this.toolkit.requireUserConfirm(toolCall.name) &&
                 !this.confirmedToolCallIds.includes(toolCall.id)
             ) {
-                toolCall.awaitUserConfirmation = true;
+                toolCall.state = 'asking';
                 // Find the continuous tool calls that require user confirmation
                 let i = index + 1;
                 for (; i < pendingToolCalls.length; i++) {
@@ -332,7 +332,7 @@ export class Agent {
                         this.confirmedToolCallIds.includes(nextToolCall.id)
                     )
                         break;
-                    nextToolCall.awaitUserConfirmation = true;
+                    nextToolCall.state = 'asking';
                 }
                 return {
                     awaitingType: EventType.REQUIRE_USER_CONFIRM,
@@ -431,14 +431,20 @@ export class Agent {
                         ]);
                     }
                 }
-                // Remove the tool call from the awaiting state
-                const processedToolCallIds = event.confirm_results.map(
-                    result => result.tool_call.id
+                // Update tool call states based on confirm results
+                const confirmedIds = new Set(
+                    event.confirm_results.filter(r => r.confirmed).map(r => r.tool_call.id)
+                );
+                const deniedIds = new Set(
+                    event.confirm_results.filter(r => !r.confirmed).map(r => r.tool_call.id)
                 );
-                // Set the awaitingUserConfirmation flag to undefined for UI update
                 this.context.at(-1)?.content.forEach(content => {
-                    if (content.type === 'tool_call' && processedToolCallIds.includes(content.id)) {
-                        delete content.awaitUserConfirmation;
+                    if (content.type === 'tool_call') {
+                        if (confirmedIds.has(content.id)) {
+                            content.state = 'allowed';
+                        } else if (deniedIds.has(content.id)) {
+                            content.state = 'finished';
+                        }
                     }
                 });
             }

package/src/formatter/dashscope-chat-formatter.test.ts

@@ -63,12 +63,14 @@ describe('DashScopeChatFormatter', () => {
                         id: '1',
                         name: 'google_search',
                         input: '{"query": "example1"}',
+                        state: 'pending',
                     },
                     {
                         type: 'tool_call',
                         id: '2',
                         name: 'bing_search',
                         input: '{"query": "example2"}',
+                        state: 'pending',
                     },
                     {
                         type: 'tool_result',
@@ -263,6 +265,7 @@ describe('DashScopeChatFormatter', () => {
                         id: '1',
                         name: 'google_search',
                         input: '{\"query\": \"example1\"}',
+                        state: 'pending',
                     },
                     {
                         type: 'tool_result',

package/src/formatter/openai-chat-formatter.test.ts

@@ -54,12 +54,14 @@ describe('OpenAIChatFormatter', () => {
                         id: '1',
                         name: 'google_search',
                         input: '{"query": "example1"}',
+                        state: 'pending',
                     },
                     {
                         type: 'tool_call',
                         id: '2',
                         name: 'bing_search',
                         input: '{"query": "example2"}',
+                        state: 'pending',
                     },
                     {
                         type: 'tool_result',
@@ -195,7 +197,13 @@ describe('OpenAIChatFormatter', () => {
             createMsg({
                 name: 'assistant',
                 content: [
-                    { type: 'tool_call', id: '1', name: 'google_search', input: '{"query": "A"}' },
+                    {
+                        type: 'tool_call',
+                        id: '1',
+                        name: 'google_search',
+                        input: '{"query": "A"}',
+                        state: 'pending',
+                    },
                     {
                         type: 'tool_result',
                         id: '1',

package/src/mcp/http.test.ts

@@ -215,6 +215,7 @@ describe('HTTPStatefulMCPClient', () => {
             name: 'add',
             type: 'tool_call',
             input: `{"a": 10, "b": 20}`,
+            state: 'pending',
         });
         for await (const item of res) {
             expect(item.content.length).toBeGreaterThan(0);
@@ -288,6 +289,7 @@ describe('HTTPStatelessMCPClient', () => {
             name: 'add',
             type: 'tool_call',
             input: `{"a": 15, "b": 25}`,
+            state: 'pending',
         });
         const collectedRes: ToolResponse[] = [];
         for await (const item of res) {

package/src/mcp/stdio.test.ts

@@ -77,6 +77,7 @@ describeUnlessWindows('StdIOMCPClient', () => {
             name: 'read_file',
             type: 'tool_call',
             input: `{"path": "${testFilePath}"}`,
+            state: 'pending',
         });
         for await (const item of res) {
             expect(item.content.length).toBeGreaterThan(0);