From ba70b08866c09b5917b4c282a76a1601853028bf Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Sun, 22 Jun 2025 19:58:24 +0800
Subject: [PATCH] finish post test

---
 .../chat/chat-box/options/export.vue          |  3 ++-
 .../main-panel/chat/core/task-loop.ts         |  2 +-
 resources/openmcp-sdk-release/task-loop.d.ts  |  2 +-
 service/src/hook/sdk.ts                       | 21 ++++++++++++++-----
 service/src/main.ts                           |  1 +
 service/task-loop.d.ts                        |  2 +-
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/renderer/src/components/main-panel/chat/chat-box/options/export.vue b/renderer/src/components/main-panel/chat/chat-box/options/export.vue
index a797b98..9b1568c 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/export.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/export.vue
@@ -7,7 +7,7 @@
 
     </el-tooltip>
 
-    <el-dialog v-model="showDialog" width="fit-content">
+    <el-dialog v-model="showDialog" width="800px">
 
         <template #header>
             <div>
@@ -81,6 +81,7 @@ const generateExportData = computed(() => {
             mcpServers[client.name] = {
                 command: option.command,
                 args: option.args,
+                cwd: option.cwd,
                 description: "",
             }
         } else if (type === 'SSE') {
diff --git a/renderer/src/components/main-panel/chat/core/task-loop.ts b/renderer/src/components/main-panel/chat/core/task-loop.ts
index 7269522..fe1627c 100644
--- a/renderer/src/components/main-panel/chat/core/task-loop.ts
+++ b/renderer/src/components/main-panel/chat/core/task-loop.ts
@@ -767,7 +767,7 @@ export class TaskLoop {
         }
     }
 
-    public async createStorage(settings?: ChatSetting): Promise<ChatStorage> {
+    public async createStorage(settings?: Partial<ChatSetting>): Promise<ChatStorage> {
         let {
             enableXmlWrapper = false,
             systemPrompt = '',
diff --git a/resources/openmcp-sdk-release/task-loop.d.ts b/resources/openmcp-sdk-release/task-loop.d.ts
index 1240c5f..e72a6b6 100644
--- a/resources/openmcp-sdk-release/task-loop.d.ts
+++ b/resources/openmcp-sdk-release/task-loop.d.ts
@@ -300,7 +300,7 @@ export class TaskLoop {
     /**
      * @description Create single conversation context
      */
-    createStorage(settings?: ChatSetting): Promise<ChatStorage>;
+    createStorage(settings?: Partial<ChatSetting>): Promise<ChatStorage>;
 
     /**
      * @description Get prompt template from mcp server
diff --git a/service/src/hook/sdk.ts b/service/src/hook/sdk.ts
index 6349c57..5b1aa7b 100644
--- a/service/src/hook/sdk.ts
+++ b/service/src/hook/sdk.ts
@@ -83,6 +83,7 @@ interface StdioMCPConfig {
     env?: {
         [key: string]: string;
     };
+    cwd?: string,
     description?: string;
     prompts?: string[];
     resources?: string[];
@@ -207,6 +208,7 @@ export class OmAgent {
 
                 this._adapter.addMcp({
                     commandString,
+                    cwd: mcpConfig.cwd,
                     connectionType: 'STDIO',
                     env: mcpConfig.env,
                     description: mcpConfig.description,
@@ -230,7 +232,7 @@ export class OmAgent {
         this._adapter.addMcp(connectionArgs);
     }
 
-    private async getLoop(loopOption?: TaskLoopOptions) {
+    public async getLoop(loopOption?: TaskLoopOptions) {
 
         if (this._loop) {
             if (loopOption) {
@@ -273,7 +275,7 @@ export class OmAgent {
      * @returns 
      */
     public async ainvoke(
-        { messages, settings }: { messages: ChatMessage[] | string; settings?: ChatSetting & Partial<TaskLoopOptions>; }
+        { messages, settings }: { messages: ChatMessage[] | string; settings?: Partial<ChatSetting & TaskLoopOptions>; }
     ) {
         if (messages.length === 0) {
             throw new Error('messages is empty');
@@ -296,12 +298,21 @@ export class OmAgent {
         if (typeof messages === 'string') {
             userMessage = messages;
         } else {
-            const lastMessageContent = messages.at(-1)?.content;
-            if (typeof lastMessageContent === 'string') {
-                userMessage = lastMessageContent;
+            // 获取messages数组
+            const messagesArray = Array.isArray(messages) ? messages : [messages];
+            
+            // 将最后一个消息赋值给lastMessage
+            const lastMessage = messagesArray.at(-1);
+            if (lastMessage && typeof lastMessage.content === 'string') {
+                userMessage = lastMessage.content;
             } else {
                 throw new Error('last message content is undefined');
             }
+            
+            // 将剩余消息存入storage.messages
+            if (messagesArray.length > 1) {
+                storage.messages = messagesArray.slice(0, -1);
+            }
         }
 
         // select correct llm config
diff --git a/service/src/main.ts b/service/src/main.ts
index a8b0b66..f8575c5 100644
--- a/service/src/main.ts
+++ b/service/src/main.ts
@@ -13,6 +13,7 @@ export interface VSCodeMessage {
     callbackId?: string;
 }
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 // 统一路径变量
 const devHome = join(__dirname, '..', '..');
diff --git a/service/task-loop.d.ts b/service/task-loop.d.ts
index 1240c5f..e72a6b6 100644
--- a/service/task-loop.d.ts
+++ b/service/task-loop.d.ts
@@ -300,7 +300,7 @@ export class TaskLoop {
     /**
      * @description Create single conversation context
      */
-    createStorage(settings?: ChatSetting): Promise<ChatStorage>;
+    createStorage(settings?: Partial<ChatSetting>): Promise<ChatStorage>;
 
     /**
      * @description Get prompt template from mcp server