mycto_agent 0.1.5 → 0.1.6

package/dist/index.d.mts

@@ -696,6 +696,8 @@ type LLMStreamEvent = {
 } | {
     type: 'tool-result';
     toolCallId: string;
+    toolName: string;
+    args: Record<string, unknown>;
     result: unknown;
 } | {
     type: 'finish';
@@ -957,13 +959,13 @@ declare class OpenAgent {
      */
     private executeTool;
     /**
-     * 非流式对话（带 Agent Loop）
+     * 非流式对话（AI SDK 自动多步）
      */
     chat(message: string, options?: {
         sessionId?: string;
     }): Promise<ChatResult>;
     /**
-     * 流式对话
+     * 流式对话（AI SDK 自动多步）
      */
     stream(message: string, options?: {
         sessionId?: string;

package/dist/index.d.ts

@@ -696,6 +696,8 @@ type LLMStreamEvent = {
 } | {
     type: 'tool-result';
     toolCallId: string;
+    toolName: string;
+    args: Record<string, unknown>;
     result: unknown;
 } | {
     type: 'finish';
@@ -957,13 +959,13 @@ declare class OpenAgent {
      */
     private executeTool;
     /**
-     * 非流式对话（带 Agent Loop）
+     * 非流式对话（AI SDK 自动多步）
      */
     chat(message: string, options?: {
         sessionId?: string;
     }): Promise<ChatResult>;
     /**
-     * 流式对话
+     * 流式对话（AI SDK 自动多步）
      */
     stream(message: string, options?: {
         sessionId?: string;

package/dist/index.js

@@ -1313,6 +1313,8 @@ async function stream(input) {
             yield {
               type: "tool-result",
               toolCallId: e.toolCallId,
+              toolName: e.toolName,
+              args: e.args ?? e.input ?? {},
               result: e.result ?? e.output
             };
             break;
@@ -3483,7 +3485,7 @@ You can read, write, and edit files, search code, and execute commands.`
         }
       }
       /**
-       * 非流式对话（带 Agent Loop）
+       * 非流式对话（AI SDK 自动多步）
        */
       async chat(message, options) {
         await this.ensureInitialized();
@@ -3496,90 +3498,61 @@ You can read, write, and edit files, search code, and execute commands.`
         const msgId = `msg_${Date.now()}`;
         const ctx = this.createToolContext(sessionId2, msgId);
         const tools = getAIToolsForAgent(this.agent, ctx, this.mode);
+        const messages = await getSessionMessages(sessionId2);
+        const modelMessages = await toModelMessages(messages);
+        const result = await stream({
+          providerId: this.providerId,
+          modelId: this.modelId,
+          messages: modelMessages,
+          system: buildSystemPrompt(this.agent),
+          tools,
+          temperature: this.temperature,
+          maxOutputTokens: this.maxOutputTokens,
+          maxSteps: this.maxSteps
+          // AI SDK 自动处理多步
+        });
         let fullText = "";
         const toolCalls = [];
         let totalUsage = { input: 0, output: 0 };
         let totalCost = 0;
         let finishReason = "unknown";
-        let step = 0;
-        while (step < this.maxSteps) {
-          step++;
-          log6.debug(`Agent loop step ${step}/${this.maxSteps}`);
-          const messages = await getSessionMessages(sessionId2);
-          const modelMessages = await toModelMessages(messages);
-          const result = await stream({
-            providerId: this.providerId,
-            modelId: this.modelId,
-            messages: modelMessages,
-            system: buildSystemPrompt(this.agent),
-            tools,
-            temperature: this.temperature,
-            maxOutputTokens: this.maxOutputTokens,
-            maxSteps: 1
-            // 每次只执行一步，由我们控制循环
-          });
-          let stepText = "";
-          const stepToolCalls = [];
-          for await (const event of result.fullStream) {
-            switch (event.type) {
-              case "text-delta":
-                stepText += event.text;
-                break;
-              case "tool-call":
-                stepToolCalls.push({
-                  id: event.toolCallId,
-                  name: event.toolName,
-                  args: event.args,
-                  status: "PENDING",
-                  providerMetadata: event.providerMetadata
-                });
-                break;
-              case "finish":
-                finishReason = event.finishReason;
-                totalUsage.input += event.usage.tokens.input;
-                totalUsage.output += event.usage.tokens.output;
-                totalCost += event.usage.cost;
-                break;
-            }
-          }
-          if (stepText) {
-            fullText += (fullText && stepText ? "\n" : "") + stepText;
-          }
-          if (stepToolCalls.length === 0) {
-            if (stepText) {
-              await batchSaveMessage({
-                sessionId: sessionId2,
-                role: "ASSISTANT",
-                parts: [{ type: "TEXT", text: stepText }]
+        const assistantParts = [];
+        for await (const event of result.fullStream) {
+          switch (event.type) {
+            case "text-delta":
+              fullText += event.text;
+              break;
+            case "tool-call":
+              log6.debug(`Tool call: ${event.toolName}`, { args: event.args });
+              break;
+            case "tool-result":
+              toolCalls.push({
+                name: event.toolName,
+                input: event.args,
+                output: String(event.result),
+                status: "COMPLETED"
               });
-            }
-            break;
-          }
-          const assistantParts = [];
-          if (stepText) {
-            assistantParts.push({ type: "TEXT", text: stepText });
-          }
-          for (const call of stepToolCalls) {
-            log6.debug(`Executing tool: ${call.name}`, { args: call.args });
-            const result2 = await this.executeTool(call.name, call.args, ctx);
-            call.output = result2.output;
-            call.status = "COMPLETED";
-            toolCalls.push({
-              name: call.name,
-              input: call.args,
-              output: result2.output,
-              status: "COMPLETED"
-            });
-            assistantParts.push({
-              type: "TOOL",
-              toolName: call.name,
-              toolCallId: call.id,
-              toolInput: call.args,
-              toolOutput: result2.output,
-              toolStatus: "COMPLETED",
-              toolMeta: call.providerMetadata
-            });
+              assistantParts.push({
+                type: "TOOL",
+                toolName: event.toolName,
+                toolCallId: event.toolCallId,
+                toolInput: event.args,
+                toolOutput: String(event.result),
+                toolStatus: "COMPLETED"
+              });
+              break;
+            case "finish":
+              finishReason = event.finishReason;
+              totalUsage.input += event.usage.tokens.input;
+              totalUsage.output += event.usage.tokens.output;
+              totalCost += event.usage.cost;
+              break;
           }
+        }
+        if (fullText) {
+          assistantParts.unshift({ type: "TEXT", text: fullText });
+        }
+        if (assistantParts.length > 0) {
           await batchSaveMessage({
             sessionId: sessionId2,
             role: "ASSISTANT",
@@ -3596,7 +3569,7 @@ You can read, write, and edit files, search code, and execute commands.`
         };
       }
       /**
-       * 流式对话
+       * 流式对话（AI SDK 自动多步）
        */
       async *stream(message, options) {
         await this.ensureInitialized();
@@ -3609,105 +3582,78 @@ You can read, write, and edit files, search code, and execute commands.`
         const msgId = `msg_${Date.now()}`;
         const ctx = this.createToolContext(sessionId2, msgId);
         const tools = getAIToolsForAgent(this.agent, ctx, this.mode);
+        const messages = await getSessionMessages(sessionId2);
+        const modelMessages = await toModelMessages(messages);
         let fullText = "";
         const toolCalls = [];
         let totalUsage = { input: 0, output: 0 };
         let totalCost = 0;
         let finishReason = "unknown";
-        let step = 0;
+        const assistantParts = [];
         try {
-          while (step < this.maxSteps) {
-            step++;
-            const messages = await getSessionMessages(sessionId2);
-            const modelMessages = await toModelMessages(messages);
-            const result = await stream({
-              providerId: this.providerId,
-              modelId: this.modelId,
-              messages: modelMessages,
-              system: buildSystemPrompt(this.agent),
-              tools,
-              temperature: this.temperature,
-              maxOutputTokens: this.maxOutputTokens,
-              maxSteps: 1
-            });
-            let stepText = "";
-            const stepToolCalls = [];
-            for await (const event of result.fullStream) {
-              switch (event.type) {
-                case "text-delta":
-                  stepText += event.text;
-                  yield { type: "text", text: event.text };
-                  break;
-                case "reasoning-delta":
-                  yield { type: "reasoning", text: event.text };
-                  break;
-                case "tool-call":
-                  stepToolCalls.push({
-                    id: event.toolCallId,
-                    name: event.toolName,
-                    args: event.args,
-                    status: "PENDING",
-                    providerMetadata: event.providerMetadata
-                  });
-                  yield {
-                    type: "tool-start",
-                    name: event.toolName,
-                    input: event.args
-                  };
-                  break;
-                case "finish":
-                  finishReason = event.finishReason;
-                  totalUsage.input += event.usage.tokens.input;
-                  totalUsage.output += event.usage.tokens.output;
-                  totalCost += event.usage.cost;
-                  break;
-                case "error":
-                  yield { type: "error", error: event.error };
-                  return;
-              }
-            }
-            if (stepText) {
-              fullText += (fullText && stepText ? "\n" : "") + stepText;
-            }
-            if (stepToolCalls.length === 0) {
-              if (stepText) {
-                await batchSaveMessage({
-                  sessionId: sessionId2,
-                  role: "ASSISTANT",
-                  parts: [{ type: "TEXT", text: stepText }]
+          const result = await stream({
+            providerId: this.providerId,
+            modelId: this.modelId,
+            messages: modelMessages,
+            system: buildSystemPrompt(this.agent),
+            tools,
+            temperature: this.temperature,
+            maxOutputTokens: this.maxOutputTokens,
+            maxSteps: this.maxSteps
+            // AI SDK 自动处理多步
+          });
+          for await (const event of result.fullStream) {
+            switch (event.type) {
+              case "text-delta":
+                fullText += event.text;
+                yield { type: "text", text: event.text };
+                break;
+              case "reasoning-delta":
+                yield { type: "reasoning", text: event.text };
+                break;
+              case "tool-call":
+                yield {
+                  type: "tool-start",
+                  name: event.toolName,
+                  input: event.args
+                };
+                break;
+              case "tool-result":
+                toolCalls.push({
+                  name: event.toolName,
+                  input: event.args,
+                  output: String(event.result),
+                  status: "COMPLETED"
                 });
-              }
-              break;
-            }
-            const assistantParts = [];
-            if (stepText) {
-              assistantParts.push({ type: "TEXT", text: stepText });
-            }
-            for (const call of stepToolCalls) {
-              const toolResult = await this.executeTool(call.name, call.args, ctx);
-              call.output = toolResult.output;
-              call.status = "COMPLETED";
-              toolCalls.push({
-                name: call.name,
-                input: call.args,
-                output: toolResult.output,
-                status: "COMPLETED"
-              });
-              yield {
-                type: "tool-end",
-                name: call.name,
-                output: toolResult.output
-              };
-              assistantParts.push({
-                type: "TOOL",
-                toolName: call.name,
-                toolCallId: call.id,
-                toolInput: call.args,
-                toolOutput: toolResult.output,
-                toolStatus: "COMPLETED",
-                toolMeta: call.providerMetadata
-              });
+                assistantParts.push({
+                  type: "TOOL",
+                  toolName: event.toolName,
+                  toolCallId: event.toolCallId,
+                  toolInput: event.args,
+                  toolOutput: String(event.result),
+                  toolStatus: "COMPLETED"
+                });
+                yield {
+                  type: "tool-end",
+                  name: event.toolName,
+                  output: String(event.result)
+                };
+                break;
+              case "finish":
+                finishReason = event.finishReason;
+                totalUsage.input += event.usage.tokens.input;
+                totalUsage.output += event.usage.tokens.output;
+                totalCost += event.usage.cost;
+                break;
+              case "error":
+                yield { type: "error", error: event.error };
+                return;
             }
+          }
+          if (fullText) {
+            assistantParts.unshift({ type: "TEXT", text: fullText });
+          }
+          if (assistantParts.length > 0) {
             await batchSaveMessage({
               sessionId: sessionId2,
               role: "ASSISTANT",