diff --git a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
index 7f08def6cc..dd4fb1d516 100644
--- a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
@@ -85,7 +85,7 @@ export class GeminiAPIClient extends BaseApiClient<
       ...rest,
       config: {
         ...rest.config,
-        abortSignal: options?.abortSignal,
+        abortSignal: options?.signal,
         httpOptions: {
           ...rest.config?.httpOptions,
           timeout: options?.timeout
@@ -479,6 +479,7 @@ export class GeminiAPIClient extends BaseApiClient<
             for (const message of messages) {
               history.push(await this.convertMessageToSdkParam(message))
             }
+            messages.push(userLastMessage)
           }
         }
 
diff --git a/src/renderer/src/types/sdk.ts b/src/renderer/src/types/sdk.ts
index c066952ec1..559e02ecae 100644
--- a/src/renderer/src/types/sdk.ts
+++ b/src/renderer/src/types/sdk.ts
@@ -102,6 +102,6 @@ export type GeminiSdkToolCall = FunctionCall
 
 export type GeminiOptions = {
   streamOutput: boolean
-  abortSignal?: AbortSignal
+  signal?: AbortSignal
   timeout?: number
 }