@agentscope-ai/agentscope 0.0.2 → 0.0.4

package/dist/agent/index.js

@@ -44,10 +44,12 @@ function createMsg({
   role,
   metadata = {},
   id = crypto.randomUUID(),
-  timestamp = (/* @__PURE__ */ new Date()).toISOString(),
+  created_at = (/* @__PURE__ */ new Date()).toISOString(),
+  finished_at,
   usage
 }) {
-  return { id, name, role, content, metadata, timestamp, usage };
+  const contentBlocks = typeof content === "string" ? [{ id: crypto.randomUUID(), type: "text", text: content }] : content;
+  return { id, name, role, content: contentBlocks, metadata, created_at, finished_at, usage };
 }
 function getContentBlocks(msg, blockType) {
   if (!blockType) return msg.content;
@@ -813,13 +815,13 @@ var Agent = class {
     const preToolCalls = [];
     for (const [index, toolCall] of pendingToolCalls.entries()) {
       if (this.toolkit.requireUserConfirm(toolCall.name) && !this.confirmedToolCallIds.includes(toolCall.id)) {
-        toolCall.awaitUserConfirmation = true;
+        toolCall.state = "asking";
         let i = index + 1;
         for (; i < pendingToolCalls.length; i++) {
           const nextToolCall = pendingToolCalls[i];
           if (!this.toolkit.requireUserConfirm(nextToolCall.name) || this.confirmedToolCallIds.includes(nextToolCall.id))
             break;
-          nextToolCall.awaitUserConfirmation = true;
+          nextToolCall.state = "asking";
         }
         return {
           awaitingType: "REQUIRE_USER_CONFIRM" /* REQUIRE_USER_CONFIRM */,
@@ -862,46 +864,46 @@ var Agent = class {
       }
       const event = options.event;
       if (event.type === "EXTERNAL_EXECUTION_RESULT" /* EXTERNAL_EXECUTION_RESULT */) {
-        this._saveToContext(event.executionResults);
+        this._saveToContext(event.execution_results);
       } else if (event.type === "USER_CONFIRM_RESULT" /* USER_CONFIRM_RESULT */) {
-        for (const result of event.confirmResults) {
+        for (const result of event.confirm_results) {
           if (result.confirmed) {
-            this.confirmedToolCallIds.push(result.toolCall.id);
+            this.confirmedToolCallIds.push(result.tool_call.id);
           } else {
-            const rejectionRes = `<system-info>**Note** the user rejected the execution of tool "${result.toolCall.name}"!</system-info>`;
+            const rejectionRes = `<system-info>**Note** the user rejected the execution of tool "${result.tool_call.name}"!</system-info>`;
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
               type: "TOOL_RESULT_START" /* TOOL_RESULT_START */,
-              replyId: this.replyId,
-              toolCallId: result.toolCall.id
+              reply_id: this.replyId,
+              tool_call_id: result.tool_call.id
             };
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
               type: "TOOL_RESULT_TEXT_DELTA" /* TOOL_RESULT_TEXT_DELTA */,
-              replyId: this.replyId,
-              toolCallId: result.toolCall.id,
+              reply_id: this.replyId,
+              tool_call_id: result.tool_call.id,
               delta: rejectionRes
             };
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
               type: "TOOL_RESULT_END" /* TOOL_RESULT_END */,
-              replyId: this.replyId,
-              toolCallId: result.toolCall.id,
+              reply_id: this.replyId,
+              tool_call_id: result.tool_call.id,
               state: "interrupted"
             };
             this._saveToContext([
               {
                 type: "tool_result",
-                id: result.toolCall.id,
-                name: result.toolCall.name,
+                id: result.tool_call.id,
+                name: result.tool_call.name,
                 output: [
                   {
                     id: crypto.randomUUID(),
                     type: "text",
-                    text: `<system-info>**Note** the user rejected the execution of tool "${result.toolCall.name}"!</system-info>`
+                    text: `<system-info>**Note** the user rejected the execution of tool "${result.tool_call.name}"!</system-info>`
                   }
                 ],
                 state: "interrupted"
@@ -909,10 +911,19 @@ var Agent = class {
             ]);
           }
         }
-        const processedToolCallIds = event.confirmResults.map((result) => result.toolCall.id);
+        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)
+        );
         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";
+            }
           }
         });
       }
@@ -922,10 +933,10 @@ var Agent = class {
       this.confirmedToolCallIds = [];
       yield {
         id: crypto.randomUUID(),
-        type: "RUN_STARTED" /* RUN_STARTED */,
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-        sessionId: "",
-        replyId: this.replyId,
+        type: "REPLY_START" /* REPLY_START */,
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
+        session_id: "",
+        reply_id: this.replyId,
         name: this.name,
         role: "assistant"
       };
@@ -953,10 +964,10 @@ var Agent = class {
       if (awaitingType) {
         yield {
           id: crypto.randomUUID(),
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+          created_at: (/* @__PURE__ */ new Date()).toISOString(),
           type: awaitingType,
-          replyId: this.replyId,
-          toolCalls: awaitingToolCalls
+          reply_id: this.replyId,
+          tool_calls: awaitingToolCalls
         };
         return createMsg({
           name: this.name,
@@ -979,10 +990,10 @@ var Agent = class {
     }
     yield {
       id: crypto.randomUUID(),
-      type: "RUN_FINISHED" /* RUN_FINISHED */,
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      sessionId: "",
-      replyId: this.replyId
+      type: "REPLY_END" /* REPLY_END */,
+      created_at: (/* @__PURE__ */ new Date()).toISOString(),
+      session_id: "",
+      reply_id: this.replyId
     };
     return createMsg({
       id: this.replyId,
@@ -1004,10 +1015,10 @@ var Agent = class {
     const tools = this.toolkit.getJSONSchemas();
     yield {
       id: crypto.randomUUID(),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      type: "MODEL_CALL_STARTED" /* MODEL_CALL_STARTED */,
-      replyId: this.replyId,
-      modelName: this.model.modelName
+      created_at: (/* @__PURE__ */ new Date()).toISOString(),
+      type: "MODEL_CALL_START" /* MODEL_CALL_START */,
+      reply_id: this.replyId,
+      model_name: this.model.modelName
     };
     const res = await this.model.call({
       messages: [
@@ -1053,39 +1064,39 @@ var Agent = class {
     if (blockIds.textBlockId) {
       yield {
         id: crypto.randomUUID(),
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
         type: "TEXT_BLOCK_END" /* TEXT_BLOCK_END */,
-        replyId: this.replyId,
-        blockId: blockIds.textBlockId
+        reply_id: this.replyId,
+        block_id: blockIds.textBlockId
       };
     }
     if (blockIds.thinkingBlockId) {
       yield {
         id: crypto.randomUUID(),
-        createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
         type: "THINKING_BLOCK_END" /* THINKING_BLOCK_END */,
-        replyId: this.replyId,
-        blockId: blockIds.thinkingBlockId
+        reply_id: this.replyId,
+        block_id: blockIds.thinkingBlockId
       };
     }
     if (blockIds.toolCallIds.length > 0) {
-      for (const toolCallId of blockIds.toolCallIds) {
+      for (const tool_call_id of blockIds.toolCallIds) {
         yield {
           id: crypto.randomUUID(),
-          createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+          created_at: (/* @__PURE__ */ new Date()).toISOString(),
           type: "TOOL_CALL_END" /* TOOL_CALL_END */,
-          replyId: this.replyId,
-          toolCallId
+          reply_id: this.replyId,
+          tool_call_id
         };
       }
     }
     yield {
       id: crypto.randomUUID(),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      type: "MODEL_CALL_ENDED" /* MODEL_CALL_ENDED */,
-      replyId: this.replyId,
-      inputTokens: completedResponse.usage?.inputTokens || 0,
-      outputTokens: completedResponse.usage?.outputTokens || 0
+      created_at: (/* @__PURE__ */ new Date()).toISOString(),
+      type: "MODEL_CALL_END" /* MODEL_CALL_END */,
+      reply_id: this.replyId,
+      input_tokens: completedResponse.usage?.inputTokens || 0,
+      output_tokens: completedResponse.usage?.outputTokens || 0
     };
     return completedResponse;
   }
@@ -1101,10 +1112,10 @@ var Agent = class {
     yield {
       type: "TOOL_RESULT_START" /* TOOL_RESULT_START */,
       id: crypto.randomUUID(),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      replyId: this.replyId,
-      toolCallId: options.toolCall.id,
-      toolCallName: options.toolCall.name
+      created_at: (/* @__PURE__ */ new Date()).toISOString(),
+      reply_id: this.replyId,
+      tool_call_id: options.toolCall.id,
+      tool_call_name: options.toolCall.name
     };
     while (true) {
       const { value, done } = await res.next();
@@ -1156,18 +1167,18 @@ var Agent = class {
             responseId.textBlockId = crypto.randomUUID();
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
               type: "TEXT_BLOCK_START" /* TEXT_BLOCK_START */,
-              replyId: this.replyId,
-              blockId: responseId.textBlockId
+              reply_id: this.replyId,
+              block_id: responseId.textBlockId
             };
           }
           yield {
             id: crypto.randomUUID(),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            created_at: (/* @__PURE__ */ new Date()).toISOString(),
             type: "TEXT_BLOCK_DELTA" /* TEXT_BLOCK_DELTA */,
-            replyId: this.replyId,
-            blockId: responseId.textBlockId,
+            reply_id: this.replyId,
+            block_id: responseId.textBlockId,
             delta: block.text
           };
           break;
@@ -1176,18 +1187,18 @@ var Agent = class {
             responseId.thinkingBlockId = crypto.randomUUID();
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
               type: "THINKING_BLOCK_START" /* THINKING_BLOCK_START */,
-              replyId: this.replyId,
-              blockId: responseId.thinkingBlockId
+              reply_id: this.replyId,
+              block_id: responseId.thinkingBlockId
             };
           }
           yield {
             id: crypto.randomUUID(),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            created_at: (/* @__PURE__ */ new Date()).toISOString(),
             type: "THINKING_BLOCK_DELTA" /* THINKING_BLOCK_DELTA */,
-            replyId: this.replyId,
-            blockId: responseId.thinkingBlockId,
+            reply_id: this.replyId,
+            block_id: responseId.thinkingBlockId,
             delta: block.thinking
           };
           break;
@@ -1197,19 +1208,19 @@ var Agent = class {
             yield {
               id: crypto.randomUUID(),
               type: "TOOL_CALL_START" /* TOOL_CALL_START */,
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-              replyId: this.replyId,
-              toolCallId: block.id,
-              toolCallName: block.name
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
+              reply_id: this.replyId,
+              tool_call_id: block.id,
+              tool_call_name: block.name
             };
           }
           yield {
             id: crypto.randomUUID(),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            created_at: (/* @__PURE__ */ new Date()).toISOString(),
             type: "TOOL_CALL_DELTA" /* TOOL_CALL_DELTA */,
             delta: block.input,
-            replyId: this.replyId,
-            toolCallId: block.id
+            reply_id: this.replyId,
+            tool_call_id: block.id
           };
       }
     }
@@ -1228,10 +1239,10 @@ var Agent = class {
         case "text":
           yield {
             id: crypto.randomUUID(),
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            created_at: (/* @__PURE__ */ new Date()).toISOString(),
             type: "TOOL_RESULT_TEXT_DELTA" /* TOOL_RESULT_TEXT_DELTA */,
-            replyId: this.replyId,
-            toolCallId: toolCall.id,
+            reply_id: this.replyId,
+            tool_call_id: toolCall.id,
             delta: block.text
           };
           break;
@@ -1239,21 +1250,21 @@ var Agent = class {
           if (block.source.type === "base64") {
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-              type: "TOOL_RESULT_BINARY_DELTA" /* TOOL_RESULT_BINARY_DELTA */,
-              replyId: this.replyId,
-              toolCallId: toolCall.id,
-              mediaType: block.source.mediaType,
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
+              type: "TOOL_RESULT_DATA_DELTA" /* TOOL_RESULT_DATA_DELTA */,
+              reply_id: this.replyId,
+              tool_call_id: toolCall.id,
+              media_type: block.source.media_type,
               data: block.source.data
             };
           } else if (block.source.type === "url") {
             yield {
               id: crypto.randomUUID(),
-              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-              type: "TOOL_RESULT_BINARY_DELTA" /* TOOL_RESULT_BINARY_DELTA */,
-              replyId: this.replyId,
-              toolCallId: toolCall.id,
-              mediaType: block.source.mediaType,
+              created_at: (/* @__PURE__ */ new Date()).toISOString(),
+              type: "TOOL_RESULT_DATA_DELTA" /* TOOL_RESULT_DATA_DELTA */,
+              reply_id: this.replyId,
+              tool_call_id: toolCall.id,
+              media_type: block.source.media_type,
               url: block.source.url
             };
           }
@@ -1262,10 +1273,10 @@ var Agent = class {
     }
     yield {
       id: crypto.randomUUID(),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      created_at: (/* @__PURE__ */ new Date()).toISOString(),
       type: "TOOL_RESULT_END" /* TOOL_RESULT_END */,
-      replyId: this.replyId,
-      toolCallId: toolCall.id,
+      reply_id: this.replyId,
+      tool_call_id: toolCall.id,
       state: toolRes.state
     };
   }
@@ -1275,7 +1286,7 @@ var Agent = class {
    */
   async toJSON() {
     return {
-      replyId: this.replyId,
+      reply_id: this.replyId,
       confirmedToolCallIds: this.confirmedToolCallIds,
       curIter: this.curIter
     };