From ae47829fa881a280412bb9e4bf261b09a1833ffe Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Thu, 17 Apr 2025 10:51:05 +0200
Subject: [PATCH] agent: Fix system instructions typo (#28949)

See #28793, the name of the field is actually `systemInstruction` not
`systemInstructions`.

Release Notes:

- Fixed an issue where Gemini requests would fail
---
 crates/google_ai/src/google_ai.rs             | 4 ++--
 crates/language_models/src/provider/google.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/google_ai/src/google_ai.rs b/crates/google_ai/src/google_ai.rs
index 6ef9d880fa..09278d6ed2 100644
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -125,7 +125,7 @@ pub struct GenerateContentRequest {
     #[serde(default, skip_serializing_if = "String::is_empty")]
     pub model: String,
     pub contents: Vec<Content>,
-    pub system_instructions: Option<SystemInstructions>,
+    pub system_instruction: Option<SystemInstruction>,
     pub generation_config: Option<GenerationConfig>,
     pub safety_settings: Option<Vec<SafetySetting>>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -162,7 +162,7 @@ pub struct Content {
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SystemInstructions {
+pub struct SystemInstruction {
     pub parts: Vec<Part>,
 }
 
diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs
index 78e3dadcad..edf187fdbf 100644
--- a/crates/language_models/src/provider/google.rs
+++ b/crates/language_models/src/provider/google.rs
@@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;
 use editor::{Editor, EditorElement, EditorStyle};
 use futures::{FutureExt, Stream, StreamExt, future::BoxFuture};
 use google_ai::{
-    FunctionDeclaration, GenerateContentResponse, Part, SystemInstructions, UsageMetadata,
+    FunctionDeclaration, GenerateContentResponse, Part, SystemInstruction, UsageMetadata,
 };
 use gpui::{
     AnyView, App, AsyncApp, Context, Entity, FontStyle, Subscription, Task, TextStyle, WhiteSpace,
@@ -405,7 +405,7 @@ pub fn into_google(
         .map_or(false, |msg| matches!(msg.role, Role::System))
     {
         let message = request.messages.remove(0);
-        Some(SystemInstructions {
+        Some(SystemInstruction {
             parts: map_content(message.content),
         })
     } else {
@@ -414,7 +414,7 @@ pub fn into_google(
 
     google_ai::GenerateContentRequest {
         model,
-        system_instructions,
+        system_instruction: system_instructions,
         contents: request
             .messages
             .into_iter()