Merge branch 'main' into origin/cj/ai-live-session-resumption

Author: daymxn

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 ReleaseTooling/ @firebase/firebase-ios-sdk-admin
 FirebaseCore/ @firebase/firebase-ios-sdk-admin
-Package.swift @firebase/firebase-ios-sdk-admin
+/Package.swift @firebase/firebase-ios-sdk-admin
 Dangerfile @firebase/firebase-ios-sdk-admin
 **/Public @firebase/firebase-ios-sdk-admin
 *.podspec @firebase/firebase-ios-sdk-admin

Crashlytics/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Unreleased
+# 12.11.0
 - [fixed] Fixed an issue where Crashlytics API calls were silently dropped if invoked immediately after Firebase initialization.
 
 # 12.10.0

FirebaseAI.podspec

@@ -19,9 +19,9 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI SDK
   s.social_media_url = 'https://twitter.com/Firebase'
 
   ios_deployment_target = '15.0'
-  osx_deployment_target = '12.0'
+  osx_deployment_target = '10.15'
   tvos_deployment_target = '15.0'
-  watchos_deployment_target = '8.0'
+  watchos_deployment_target = '7.0'
 
   s.ios.deployment_target = ios_deployment_target
   s.osx.deployment_target = osx_deployment_target

FirebaseAI/CHANGELOG.md

@@ -6,6 +6,11 @@
   [`ContextWindowCompressionConfig`](https://firebase.google.com/docs/reference/swift/firebaseai/api/reference/Classes/ContextWindowCompressionConfig).
   (#15904)
 
+# 12.11.0
+- [feature] **Public Preview**: Introduces `GenerativeModelSession` providing
+  APIs for generating structured data from Gemini via the same `@Generable` and
+  `@Guide` macros that are used with Foundation Models.
+
 # 12.9.0
 - [changed] The URL context tool APIs are now GA.
 - [feature] Added support for implicit caching (context caching) metadata in `GenerateContentResponse`.

FirebaseAI/Sources/AGENTS.md

@@ -24,6 +24,7 @@ This directory contains the source code for the FirebaseAI library.
 - **`GenerativeAIRequest.swift`**: Defines the `GenerativeAIRequest` protocol for requests sent to the generative AI backend. It also defines `RequestOptions`.
 - **`GenerativeAIService.swift`**: Defines the `GenerativeAIService` struct, which is responsible for making requests to the generative AI backend. It handles things like authentication, URL construction, and response parsing.
 - **`GenerativeModel.swift`**: Defines the `GenerativeModel` class, which represents a remote multimodal model. It provides methods for generating content, counting tokens, and starting a chat via `startChat(history:)`, which returns a `Chat` instance.
+- **`GenerativeModelSession.swift`**: Defines the `GenerativeModelSession` class, which provides a simplified interface for single-turn interactions with a generative model. It's particularly useful for generating typed objects from a model's response using the `@Generable` macro, without the conversational turn-based structure of a `Chat`.
 - **`History.swift`**: Defines the `History` class, a thread-safe class for managing the chat history, used by the `Chat` class.
 - **`JSONValue.swift`**: Defines the `JSONValue` enum and `JSONObject` typealias for representing JSON values.
 - **`ModalityTokenCount.swift`**: Defines the `ModalityTokenCount` and `ContentModality` structs for representing token counting information for a single modality.

FirebaseAI/Sources/AILog.swift

@@ -139,7 +139,6 @@ enum AILog {
     log(level: .debug, code: code, message)
   }
 
-  @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
   static func makeInternalError(message: String, code: MessageCode) -> GenerateContentError {
     let error = GenerateContentError.internalError(underlying: NSError(
       domain: "\(Constants.baseErrorDomain).Internal",

FirebaseAI/Sources/Chat.swift

@@ -16,7 +16,6 @@ import Foundation
 
 /// An object that represents a back-and-forth chat with a model, capturing the history and saving
 /// the context in memory between each message sent.
-@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 public final class Chat: Sendable {
   private let model: GenerativeModel
   private let _history: History
@@ -37,6 +36,8 @@ public final class Chat: Sendable {
     }
   }
 
+  var generationConfig: GenerationConfig? { model.generationConfig }
+
   /// Sends a message using the existing history of this chat as context. If successful, the message
   /// and response will be added to the history. If unsuccessful, history will remain unchanged.
   /// - Parameter parts: The new content to send as a single chat message.
@@ -52,14 +53,40 @@ public final class Chat: Sendable {
   /// - Parameter content: The new content to send as a single chat message.
   /// - Returns: The model's response if no error occurred.
   /// - Throws: A ``GenerateContentError`` if an error occurred.
-  public func sendMessage(_ content: [ModelContent]) async throws
-    -> GenerateContentResponse {
+  public func sendMessage(_ content: [ModelContent]) async throws -> GenerateContentResponse {
+    return try await sendMessage(content, generationConfig: generationConfig)
+  }
+
+  /// Sends a message using the existing history of this chat as context. If successful, the message
+  /// and response will be added to the history. If unsuccessful, history will remain unchanged.
+  /// - Parameter parts: The new content to send as a single chat message.
+  /// - Returns: A stream containing the model's response or an error if an error occurred.
+  @available(macOS 12.0, watchOS 8.0, *)
+  public func sendMessageStream(_ parts: any PartsRepresentable...) throws
+    -> AsyncThrowingStream<GenerateContentResponse, Error> {
+    return try sendMessageStream([ModelContent(parts: parts)])
+  }
+
+  /// Sends a message using the existing history of this chat as context. If successful, the message
+  /// and response will be added to the history. If unsuccessful, history will remain unchanged.
+  /// - Parameter content: The new content to send as a single chat message.
+  /// - Returns: A stream containing the model's response or an error if an error occurred.
+  @available(macOS 12.0, watchOS 8.0, *)
+  public func sendMessageStream(_ content: [ModelContent]) throws
+    -> AsyncThrowingStream<GenerateContentResponse, Error> {
+    return try sendMessageStream(content, generationConfig: generationConfig)
+  }
+
+  // MARK: - Internal
+
+  func sendMessage(_ content: [ModelContent],
+                   generationConfig: GenerationConfig?) async throws -> GenerateContentResponse {
     // Ensure that the new content has the role set.
     let newContent = content.map(populateContentRole(_:))
 
     // Send the history alongside the new message as context.
     let request = history + newContent
-    let result = try await model.generateContent(request)
+    let result = try await model.generateContent(request, generationConfig: generationConfig)
     guard let reply = result.candidates.first?.content else {
       let error = NSError(domain: "com.google.generative-ai",
                           code: -1,
@@ -78,29 +105,15 @@ public final class Chat: Sendable {
     return result
   }
 
-  /// Sends a message using the existing history of this chat as context. If successful, the message
-  /// and response will be added to the history. If unsuccessful, history will remain unchanged.
-  /// - Parameter parts: The new content to send as a single chat message.
-  /// - Returns: A stream containing the model's response or an error if an error occurred.
-  @available(macOS 12.0, *)
-  public func sendMessageStream(_ parts: any PartsRepresentable...) throws
-    -> AsyncThrowingStream<GenerateContentResponse, Error> {
-    return try sendMessageStream([ModelContent(parts: parts)])
-  }
-
-  /// Sends a message using the existing history of this chat as context. If successful, the message
-  /// and response will be added to the history. If unsuccessful, history will remain unchanged.
-  /// - Parameter content: The new content to send as a single chat message.
-  /// - Returns: A stream containing the model's response or an error if an error occurred.
-  @available(macOS 12.0, *)
-  public func sendMessageStream(_ content: [ModelContent]) throws
+  @available(macOS 12.0, watchOS 8.0, *)
+  func sendMessageStream(_ content: [ModelContent], generationConfig: GenerationConfig?) throws
     -> AsyncThrowingStream<GenerateContentResponse, Error> {
     // Ensure that the new content has the role set.
     let newContent: [ModelContent] = content.map(populateContentRole(_:))
 
     // Send the history alongside the new message as context.
     let request = history + newContent
-    let stream = try model.generateContentStream(request)
+    let stream = try model.generateContentStream(request, generationConfig: generationConfig)
     return AsyncThrowingStream { continuation in
       Task {
         var aggregatedContent: [ModelContent] = []

FirebaseAI/Sources/Extensions/Internal/AGENTS.md

@@ -0,0 +1,7 @@
+# Internal Extensions
+
+This directory contains internal extensions to data models and other types. These extensions provide functionality that is specific to the internal workings of the Firebase AI SDK and are not part of the public API.
+
+## Files
+
+-   **`GenerationSchema+Gemini.swift`**: This file extends `GenerationSchema` to provide a `toGeminiJSONSchema()` method. This method transforms the schema into a format that is compatible with the Gemini backend, including renaming properties like `x-order` to `propertyOrdering`. This file is conditionally compiled and is only available when `FoundationModels` can be imported.

FirebaseAI/Sources/Extensions/Internal/ConvertibleFromGeneratedContent+Firebase.swift

@@ -0,0 +1,33 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if compiler(>=6.2) && canImport(FoundationModels)
+  import FoundationModels
+
+  @available(iOS 26.0, macOS 26.0, *)
+  @available(tvOS, unavailable)
+  @available(watchOS, unavailable)
+  public extension FoundationModels.ConvertibleFromGeneratedContent {
+    /// Initializes an instance from `FirebaseAI.GeneratedContent`.
+    ///
+    /// **Public Preview**: This API is a public preview and may be subject to change.
+    ///
+    /// - Parameters:
+    ///   - content: The `FirebaseAI.GeneratedContent` from which to initialize.
+    /// - Throws: An error if initialization fails.
+    init(_ content: FirebaseAI.GeneratedContent) throws {
+      try self.init(content.generatedContent)
+    }
+  }
+#endif // compiler(>=6.2) && canImport(FoundationModels)

FirebaseAI/Sources/Extensions/Internal/GenerationSchema+Gemini.swift

@@ -0,0 +1,60 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
+extension FirebaseAI.GenerationSchema {
+  /// Returns a Gemini-compatible JSON Schema of this `GenerationSchema`.
+  func toGeminiJSONSchema() throws -> JSONObject {
+    let encoder = JSONEncoder()
+    encoder.keyEncodingStrategy = .custom { keys in
+      guard let lastKey = keys.last else {
+        assertionFailure("Unexpected empty coding path.")
+        return SchemaCodingKey(stringValue: "")
+      }
+      if lastKey.stringValue == "x-order" {
+        return SchemaCodingKey(stringValue: "propertyOrdering")
+      }
+      return lastKey
+    }
+
+    #if canImport(FoundationModels)
+      if #available(iOS 26.0, macOS 26.0, visionOS 26.0, *) {
+        let generationSchemaData = try encoder.encode(self)
+        let jsonSchema = try JSONDecoder().decode(JSONObject.self, from: generationSchemaData)
+
+        return jsonSchema
+      }
+    #endif // canImport(FoundationModels)
+
+    // TODO: Implement FirebaseAI.GenerationSchema encoding for iOS < 26.
+    throw EncodingError.invalidValue(self, .init(codingPath: [], debugDescription: """
+    \(Self.self).#\(#function): `GenerationSchema` encoding is not yet implemented for iOS < 26.
+    """))
+  }
+
+  private struct SchemaCodingKey: CodingKey {
+    let stringValue: String
+    let intValue: Int? = nil
+
+    init(stringValue: String) {
+      self.stringValue = stringValue
+    }
+
+    init?(intValue: Int) {
+      assertionFailure("Unexpected \(Self.self) with integer value: \(intValue)")
+      return nil
+    }
+  }
+}