Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(ai): record Nano Banana image generation usage (#7400)
Eric Hayes04370b057c3d
diff --git a/Cargo.lock b/Cargo.lockindex 6820b018d3..6700d86682 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -9565,6 +9565,7 @@ name = "image_generation"version = "0.1.0"dependencies = ["ai_toolset",+ "ai_usage","anyhow","async-trait","attachment",diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/aiFeature.ts b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/aiFeature.tsindex 03e5376dda..079a4a89d6 100644--- a/apps/web/src/lib/service-clients/service-cognition/generated/schemas/aiFeature.ts+++ b/apps/web/src/lib/service-clients/service-cognition/generated/schemas/aiFeature.ts@@ -26,4 +26,5 @@ export const AiFeature = {agent_session: 'agent_session',agent_repository_choice: 'agent_repository_choice',dictation: 'dictation',+ image_generation: 'image_generation',} as const;diff --git a/apps/web/src/lib/service-clients/service-cognition/openapi.json b/apps/web/src/lib/service-clients/service-cognition/openapi.jsonindex 85b5cf5a02..ac2f0eec4f 100644--- a/apps/web/src/lib/service-clients/service-cognition/openapi.json+++ b/apps/web/src/lib/service-clients/service-cognition/openapi.json@@ -2239,7 +2239,8 @@"import","agent_session","agent_repository_choice",- "dictation"+ "dictation",+ "image_generation"]},"AssistantMessagePart": {diff --git a/crates/ai_tools/src/build_context.rs b/crates/ai_tools/src/build_context.rsindex 22ee67d7b3..822348cd67 100644--- a/crates/ai_tools/src/build_context.rs+++ b/crates/ai_tools/src/build_context.rs@@ -464,6 +464,8 @@ pub async fn build_tool_service_context_from_env(pool.clone(),);+ let recorder = ai_usage::pg_recorder_with_enforcement(pool.clone(), enforcement);+Ok(ToolServiceContext {search_service_client: search_client.clone(),email_service_client: email_ext_client,@@ -477,6 +479,7 @@ pub async fn build_tool_service_context_from_env(image_generation_tool_context: crate::build_image_generation_tool_context(&document_tool_context,build_image_generator_from_env(),+ recorder.clone(),)?,document_tool_context,properties_tool_context,@@ -509,7 +512,7 @@ pub async fn build_tool_service_context_from_env(schedule_tool_context: crate::NoOpScheduleContext,anthropic_tool_context,admission: ai_billing::composition::pg_admission_service(pool.clone(), enforcement),- recorder: ai_usage::pg_recorder_with_enforcement(pool.clone(), enforcement),+ recorder,usage_context: ai_usage::UsageContext::system(ai_usage::AiFeature::Chat),})}diff --git a/crates/ai_tools/src/tool_context/images.rs b/crates/ai_tools/src/tool_context/images.rsindex d6b0629928..a0c46a831e 100644--- a/crates/ai_tools/src/tool_context/images.rs+++ b/crates/ai_tools/src/tool_context/images.rs@@ -38,6 +38,7 @@ pub type ToolImageGenerationToolContext =pub fn build_image_generation_tool_context(documents: &ToolDocumentToolContext,generator: Arc<dyn image_generation::domain::ports::ImageGenerator>,+ recorder: Arc<dyn ai_usage::UsageRecorder>,) -> anyhow::Result<ToolImageGenerationToolContext> {// Local service URLs address the API container, while public file bytes// live in the static-file bucket. Providers receive bytes from this reader.@@ -54,12 +55,15 @@ pub fn build_image_generation_tool_context(InternalApiKey::new()?.to_string(),macro_service_urls::StaticFileServiceUrl::new()?.to_string(),);- Ok(build_with_cdn(documents, generator, cdn_base, storage))+ Ok(build_with_cdn(+ documents, generator, recorder, cdn_base, storage,+ ))}fn build_with_cdn(documents: &ToolDocumentToolContext,generator: Arc<dyn image_generation::domain::ports::ImageGenerator>,+ recorder: Arc<dyn ai_usage::UsageRecorder>,cdn_base: String,storage: static_file_service_client::StaticFileServiceClient,) -> ToolImageGenerationToolContext {@@ -82,6 +86,7 @@ fn build_with_cdn(documents.lexical_client.clone(),),),+ recorder,).with_reference_reader(references),documents.actor,@@ -96,6 +101,7 @@ pub fn build_image_generation_tool_context_test(build_with_cdn(documents,Arc::new(image_generation::domain::ports::UnconfiguredImageGenerator),+ Arc::new(ai_usage::NoOpUsageRecorder),"https://static.example.test".to_string(),static_file_service_client::StaticFileServiceClient::new("test-key".to_string(),diff --git a/crates/ai_usage/src/domain/counting.rs b/crates/ai_usage/src/domain/counting.rsindex cb0a005dc5..909ab5293b 100644--- a/crates/ai_usage/src/domain/counting.rs+++ b/crates/ai_usage/src/domain/counting.rs@@ -57,6 +57,7 @@ pub const fn is_billable_feature(feature: AiFeature) -> bool {| AiFeature::AiEditing| AiFeature::Import| AiFeature::AgentSession- | AiFeature::AgentRepositoryChoice => true,+ | AiFeature::AgentRepositoryChoice+ | AiFeature::ImageGeneration => true,}}diff --git a/crates/ai_usage/src/domain/counting/test.rs b/crates/ai_usage/src/domain/counting/test.rsindex 675ddc3d77..81e86e2abd 100644--- a/crates/ai_usage/src/domain/counting/test.rs+++ b/crates/ai_usage/src/domain/counting/test.rs@@ -1,6 +1,6 @@use super::*;-const FEATURES: [(AiFeature, bool); 13] = [+const FEATURES: [(AiFeature, bool); 14] = [(AiFeature::Chat, true),(AiFeature::Memory, false),(AiFeature::Automation, true),@@ -14,6 +14,7 @@ const FEATURES: [(AiFeature, bool); 13] = [(AiFeature::AgentSession, true),(AiFeature::AgentRepositoryChoice, true),(AiFeature::Dictation, false),+ (AiFeature::ImageGeneration, true),];#[test]diff --git a/crates/ai_usage/src/domain/ports.rs b/crates/ai_usage/src/domain/ports.rsindex 3e0d862a2e..057ff8ee9f 100644--- a/crates/ai_usage/src/domain/ports.rs+++ b/crates/ai_usage/src/domain/ports.rs@@ -73,6 +73,8 @@ pub enum AiFeature {AgentRepositoryChoice,/// User-confirmed audio transcription.Dictation,+ /// Image generation and editing.+ ImageGeneration,}/// Strip a provider prefix from a routing id, yielding the bare model api iddiff --git a/crates/ai_usage/src/outbound/pg_usage_repo/test.rs b/crates/ai_usage/src/outbound/pg_usage_repo/test.rsindex 7765a613fd..02902a7f61 100644--- a/crates/ai_usage/src/outbound/pg_usage_repo/test.rs+++ b/crates/ai_usage/src/outbound/pg_usage_repo/test.rs@@ -41,6 +41,27 @@ async fn seeded_pricing_is_available(pool: PgPool) {repo.get_pricing("whisper-1").await.unwrap(),Some(ModelPricing::Audio { per_minute: 0.006 }));+ let price = repo+ .get_pricing("gemini-2.5-flash-image")+ .await+ .unwrap()+ .unwrap();+ assert_eq!(+ price,+ ModelPricing::Tokens {+ input: 0.30,+ output: 30.0+ }+ );+ let cost = crate::Price::compute(+ price,+ UsageAmount::Tokens {+ input: 100,+ output: 1290,+ },+ )+ .unwrap();+ assert!((cost.total - 0.03873).abs() < 0.000001);assert_eq!(repo.get_pricing("nonexistent-model").await.unwrap(), None);}diff --git a/crates/image_generation/Cargo.toml b/crates/image_generation/Cargo.tomlindex 71ec81d4d2..fc28fd2aca 100644--- a/crates/image_generation/Cargo.toml+++ b/crates/image_generation/Cargo.toml@@ -6,6 +6,7 @@ publish = false[dependencies]ai_toolset = { path = "../ai_toolset" }+ai_usage = { path = "../ai_usage" }anyhow.workspace = trueasync-trait.workspace = trueattachment = { path = "../attachment" }diff --git a/crates/image_generation/README.md b/crates/image_generation/README.mdindex fca74a92e6..00e1840f17 100644--- a/crates/image_generation/README.md+++ b/crates/image_generation/README.md@@ -20,3 +20,11 @@ are not accepted. Generated static file IDs can be reused for subsequent edits.Hosts compose the provider, reference reader, and storage client in `ai_tools`.The frontend renders the returned SFS image directly.++Usage is attributed by the domain service to the creating user (including bots+acting for users), or the system identity for team bots with no acting user.+Every host injects its usage recorder. Gemini records `usageMetadata` under+`image_generation` and the requested model before decoding or saving the image,+so provider-reported costs survive refusals, invalid image data, and upload+failures. Responses without usage metadata emit a warning and no estimated usage.+Pricing for the IMAGE-only Nano Banana requests is seeded in `ai_pricing`.diff --git a/crates/image_generation/src/domain/ports.rs b/crates/image_generation/src/domain/ports.rsindex 14dc704323..da646aa181 100644--- a/crates/image_generation/src/domain/ports.rs+++ b/crates/image_generation/src/domain/ports.rs@@ -4,16 +4,20 @@ use super::models::{ImageReference, NewGeneratedImage, NewStaticImage, ReadImageError, ReferenceImage,SaveImageError, StoredGeneratedImage, StoredImage,};+use ai_usage::{UsageContext, UsageRecorder};use model_owner::CreationPrincipal;use std::future::Future;/// Renders an image from a text prompt and optional reference photos.#[async_trait::async_trait]pub trait ImageGenerator: Send + Sync + 'static {- /// Generate one image for `request`.+ /// Generate one image for `request`, recording provider-reported usage even+ /// when the response cannot be turned into an image.async fn generate_image(&self,request: &ImageGenerationRequest,+ usage: &UsageContext,+ recorder: &dyn UsageRecorder,) -> Result<GeneratedImage, ImageGenerationError>;}@@ -27,6 +31,8 @@ impl ImageGenerator for UnconfiguredImageGenerator {async fn generate_image(&self,_request: &ImageGenerationRequest,+ _usage: &UsageContext,+ _recorder: &dyn UsageRecorder,) -> Result<GeneratedImage, ImageGenerationError> {Err(ImageGenerationError::Unavailable)}diff --git a/crates/image_generation/src/domain/service.rs b/crates/image_generation/src/domain/service.rsindex 2f89196ed6..937bfc687c 100644--- a/crates/image_generation/src/domain/service.rs+++ b/crates/image_generation/src/domain/service.rs@@ -8,6 +8,7 @@ use super::ports::{ImageGenerationService, ImageGenerator, ImageMarkdownComposer, ImageReferenceReader,ImageStore, UnconfiguredImageReferenceReader,};+use ai_usage::{AiFeature, UsageContext, UsageRecorder};use model_owner::CreationPrincipal;use std::sync::Arc;@@ -20,6 +21,7 @@ pub struct ImageGenerationServiceImpl<Store, References = UnconfiguredImageReferstore: Store,composer: Arc<dyn ImageMarkdownComposer>,references: References,+ recorder: Arc<dyn UsageRecorder>,}impl<Store> ImageGenerationServiceImpl<Store> {@@ -28,12 +30,14 @@ impl<Store> ImageGenerationServiceImpl<Store> {generator: Arc<dyn ImageGenerator>,store: Store,composer: Arc<dyn ImageMarkdownComposer>,+ recorder: Arc<dyn UsageRecorder>,) -> Self {Self {generator,store,composer,references: UnconfiguredImageReferenceReader,+ recorder,}}}@@ -46,6 +50,7 @@ impl<Store, References> ImageGenerationServiceImpl<Store, References> {store: self.store,composer: self.composer,references,+ recorder: self.recorder,}}}@@ -105,13 +110,21 @@ impl<Store: ImageStore, References: ImageReferenceReader> ImageGenerationServicereferences.push(image);}+ let usage = match principal.user() {+ Some(user) => UsageContext::new(AiFeature::ImageGeneration, user.clone()),+ None => UsageContext::system(AiFeature::ImageGeneration),+ };let generated = self.generator- .generate_image(&ImageGenerationRequest {- prompt: prompt.to_string(),- aspect_ratio,- reference_images: references,- })+ .generate_image(+ &ImageGenerationRequest {+ prompt: prompt.to_string(),+ aspect_ratio,+ reference_images: references,+ },+ &usage,+ self.recorder.as_ref(),+ ).await?;generated.file_type().ok_or_else(|| {ImageGenerationError::Provider(anyhow::anyhow!(diff --git a/crates/image_generation/src/domain/service/test.rs b/crates/image_generation/src/domain/service/test.rsindex 12d042a220..423976c4f3 100644--- a/crates/image_generation/src/domain/service/test.rs+++ b/crates/image_generation/src/domain/service/test.rs@@ -69,8 +69,15 @@ impl ImageGenerator for FakeGenerator {async fn generate_image(&self,request: &ImageGenerationRequest,+ usage: &UsageContext,+ recorder: &dyn UsageRecorder,) -> Result<GeneratedImage, ImageGenerationError> {self.requests.lock().unwrap().push(request.clone());+ recorder.record(+ usage+ .clone()+ .into_event("gemini-2.5-flash-image".to_string(), 8, 1290),+ );self.result.clone().map_err(|reason| ImageGenerationError::Refused(reason.to_string()))@@ -108,7 +115,12 @@ fn test_service(generator: Arc<dyn ImageGenerator>,store: Arc<RecordingStore>,) -> ImageGenerationServiceImpl<Arc<RecordingStore>> {- ImageGenerationServiceImpl::new(generator, store, Arc::new(RecordingComposer::default()))+ ImageGenerationServiceImpl::new(+ generator,+ store,+ Arc::new(RecordingComposer::default()),+ Arc::new(ai_usage::NoOpUsageRecorder),+ )}fn png() -> GeneratedImage {@@ -458,6 +470,7 @@ async fn delegates_saved_image_dimensions_to_the_composer() {Arc::new(FakeGenerator::returning(png())),store,composer.clone(),+ Arc::new(ai_usage::NoOpUsageRecorder),);let created = service.create_generated_image(&principal(), request("image"))@@ -480,6 +493,7 @@ async fn reports_composition_failure_after_saving_the_image() {fail: true,..Default::default()}),+ Arc::new(ai_usage::NoOpUsageRecorder),);assert!(matches!(service@@ -489,3 +503,92 @@ async fn reports_composition_failure_after_saving_the_image() {));assert_eq!(store.saves.lock().unwrap().len(), 1);}++#[derive(Default)]+struct RecordingUsage(Mutex<Vec<ai_usage::UsageEvent>>);++impl UsageRecorder for RecordingUsage {+ fn record(&self, event: ai_usage::UsageEvent) {+ self.0.lock().unwrap().push(event);+ }+}++#[tokio::test]+async fn attributes_usage_to_the_user_even_when_upload_fails() {+ for fail in [false, true] {+ let recorder = Arc::new(RecordingUsage::default());+ let service = ImageGenerationServiceImpl::new(+ Arc::new(FakeGenerator::returning(png())),+ Arc::new(RecordingStore {+ fail,+ ..Default::default()+ }),+ Arc::new(RecordingComposer::default()),+ recorder.clone(),+ )+ .with_reference_reader(Arc::new(RecordingReader::returning(Vec::new())));+ let result = service+ .create_generated_image(&principal(), request("draw a cat"))+ .await;+ assert_eq!(result.is_err(), fail);+ let events = recorder.0.lock().unwrap();+ assert_eq!(events.len(), 1);+ assert_eq!(events[0].feature, AiFeature::ImageGeneration);+ assert_eq!(&events[0].user, principal().user().unwrap());+ assert_eq!(events[0].entity, None);+ assert_eq!(+ events[0].amount,+ ai_usage::UsageAmount::Tokens {+ input: 8,+ output: 1290+ }+ );+ }+}++#[tokio::test]+async fn invalid_requests_do_not_record_usage() {+ let recorder = Arc::new(RecordingUsage::default());+ let service = ImageGenerationServiceImpl::new(+ Arc::new(FakeGenerator::returning(png())),+ Arc::new(RecordingStore::default()),+ Arc::new(RecordingComposer::default()),+ recorder.clone(),+ );+ assert!(+ service+ .create_generated_image(&principal(), request(" "))+ .await+ .is_err()+ );+ assert!(recorder.0.lock().unwrap().is_empty());+}++#[tokio::test]+async fn direct_users_and_team_bots_have_distinct_usage_attribution() {+ let user = principal().user().unwrap().clone();+ let team_bot = CreationPrincipal::TeamBot {+ bot: bot_id::NonSystemBotId::new(bot_id::BotId::new_from_uuid(Uuid::from_u128(42)))+ .unwrap(),+ team: Uuid::from_u128(43),+ };+ for (principal, expected_user) in [+ (CreationPrincipal::User(user.clone()), user),+ (team_bot, ai_usage::SYSTEM_USER_ID.clone()),+ ] {+ let recorder = Arc::new(RecordingUsage::default());+ let service = ImageGenerationServiceImpl::new(+ Arc::new(FakeGenerator::returning(png())),+ Arc::new(RecordingStore::default()),+ Arc::new(RecordingComposer::default()),+ recorder.clone(),+ );+ service+ .create_generated_image(&principal, request("draw a cat"))+ .await+ .unwrap();+ let events = recorder.0.lock().unwrap();+ assert_eq!(events.len(), 1);+ assert_eq!(events[0].user, expected_user);+ }+}diff --git a/crates/image_generation/src/outbound/gemini.rs b/crates/image_generation/src/outbound/gemini.rsindex 57cff16869..1d7ca17507 100644--- a/crates/image_generation/src/outbound/gemini.rs+++ b/crates/image_generation/src/outbound/gemini.rs@@ -3,6 +3,7 @@use std::time::Duration;+use ai_usage::{UsageContext, UsageRecorder};use anyhow::Context as _;use base64::Engine as _;use serde::Deserialize;@@ -81,6 +82,8 @@ impl ImageGenerator for GeminiImageGenerator {async fn generate_image(&self,request: &ImageGenerationRequest,+ usage: &UsageContext,+ recorder: &dyn UsageRecorder,) -> Result<GeneratedImage, ImageGenerationError> {let response = self.client@@ -115,6 +118,20 @@ impl ImageGenerator for GeminiImageGenerator {let parsed: GenerateContentResponse = serde_json::from_str(&body).context("unexpected Gemini response shape").map_err(ImageGenerationError::Provider)?;+ if let Some(metadata) = &parsed.usage_metadata {+ recorder.record(usage.clone().into_event(+ self.model.clone(),+ metadata.prompt_token_count,+ metadata.candidates_token_count.unwrap_or_else(|| {+ metadata+ .total_token_count+ .unwrap_or(metadata.prompt_token_count)+ .saturating_sub(metadata.prompt_token_count)+ }),+ ));+ } else {+ tracing::warn!(model = %self.model, "Gemini image response omitted usage metadata");+ }parsed.into_image()}}@@ -136,6 +153,17 @@ struct GenerateContentResponse {#[serde(default)]candidates: Vec<Candidate>,prompt_feedback: Option<PromptFeedback>,+ usage_metadata: Option<UsageMetadata>,+}++#[derive(Deserialize)]+#[serde(rename_all = "camelCase")]+struct UsageMetadata {+ prompt_token_count: u64,+ // Gemini can omit candidate counts. This non-thinking, IMAGE-only request+ // can also recover output usage from the reported total minus prompt.+ candidates_token_count: Option<u64>,+ total_token_count: Option<u64>,}#[derive(Deserialize)]diff --git a/crates/image_generation/src/outbound/gemini/test.rs b/crates/image_generation/src/outbound/gemini/test.rsindex 4f7922c4af..fd46787a20 100644--- a/crates/image_generation/src/outbound/gemini/test.rs+++ b/crates/image_generation/src/outbound/gemini/test.rs@@ -29,7 +29,7 @@ fn request(aspect_ratio: Option<ImageAspectRatio>) -> ImageGenerationRequest {fn image_response(parts: serde_json::Value) -> serde_json::Value {serde_json::json!({"candidates": [{ "content": { "role": "model", "parts": parts }, "finishReason": "STOP" }],- "usageMetadata": { "promptTokenCount": 8, "totalTokenCount": 1300 }+ "usageMetadata": { "promptTokenCount": 8, "candidatesTokenCount": 1290, "totalTokenCount": 1298 }})}@@ -58,7 +58,11 @@ async fn posts_the_prompt_and_decodes_the_first_inline_image() {.await;let image = generator(&server)- .generate_image(&request(Some(ImageAspectRatio::Widescreen)))+ .generate_image(+ &request(Some(ImageAspectRatio::Widescreen)),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap();@@ -116,20 +120,24 @@ async fn posts_ordered_reference_images_with_their_mime_types_and_exact_bytes().await;let image = generator(&server)- .generate_image(&ImageGenerationRequest {- prompt: prompt.to_string(),- aspect_ratio: Some(ImageAspectRatio::Portrait),- reference_images: vec![- ReferenceImage {- bytes: PNG.to_vec(),- mime_type: "image/png".to_string(),- },- ReferenceImage {- bytes: jpeg.to_vec(),- mime_type: "image/jpeg".to_string(),- },- ],- })+ .generate_image(+ &ImageGenerationRequest {+ prompt: prompt.to_string(),+ aspect_ratio: Some(ImageAspectRatio::Portrait),+ reference_images: vec![+ ReferenceImage {+ bytes: PNG.to_vec(),+ mime_type: "image/png".to_string(),+ },+ ReferenceImage {+ bytes: jpeg.to_vec(),+ mime_type: "image/jpeg".to_string(),+ },+ ],+ },+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap();@@ -150,7 +158,11 @@ async fn omits_image_config_without_an_aspect_ratio() {.await;generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap();@@ -173,7 +185,11 @@ async fn text_only_and_blocked_responses_are_refusals() {.mount(&server).await;let error = generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap_err();assert!(@@ -189,7 +205,11 @@ async fn text_only_and_blocked_responses_are_refusals() {.mount(&server).await;let error = generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap_err();assert!(@@ -205,7 +225,11 @@ async fn text_only_and_blocked_responses_are_refusals() {.mount(&server).await;let error = generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap_err();assert!(@@ -225,7 +249,11 @@ async fn http_errors_surface_the_provider_message() {.await;let error = generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder,+ ).await.unwrap_err();match error {@@ -250,7 +278,11 @@ async fn invalid_base64_is_a_provider_error() {assert!(matches!(generator(&server)- .generate_image(&request(None))+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &ai_usage::NoOpUsageRecorder+ ).await.unwrap_err(),ImageGenerationError::Provider(_)@@ -289,3 +321,147 @@ fn rejects_image_bytes_without_readable_dimensions() {Err(ImageGenerationError::Provider(_))));}++#[derive(Default)]+struct RecordingUsage(std::sync::Mutex<Vec<ai_usage::UsageEvent>>);++impl UsageRecorder for RecordingUsage {+ fn record(&self, event: ai_usage::UsageEvent) {+ self.0.lock().unwrap().push(event);+ }+}++#[tokio::test]+async fn records_provider_counts_before_image_decoding_or_refusal() {+ for parts in [+ serde_json::json!([{ "inlineData": { "mimeType": "image/png", "data": base64::engine::general_purpose::STANDARD.encode(&*PNG) } }]),+ serde_json::json!([{ "inlineData": { "mimeType": "image/png", "data": "bad base64!" } }]),+ serde_json::json!([{ "text": "Cannot generate this image" }]),+ ] {+ let server = MockServer::start().await;+ Mock::given(method("POST"))+ .respond_with(ResponseTemplate::new(200).set_body_json(image_response(parts)))+ .expect(1)+ .mount(&server)+ .await;+ let recorder = RecordingUsage::default();+ let user = macro_user_id::user_id::MacroUserIdStr::try_from(+ "macro|[email protected]".to_string(),+ )+ .unwrap();+ let usage = UsageContext::new(ai_usage::AiFeature::ImageGeneration, user.clone());+ let _ = generator(&server)+ .generate_image(&request(None), &usage, &recorder)+ .await;+ let events = recorder.0.lock().unwrap();+ assert_eq!(events.len(), 1);+ assert_eq!(events[0].user, user);+ assert_eq!(events[0].feature, ai_usage::AiFeature::ImageGeneration);+ assert_eq!(events[0].model, NANO_BANANA_MODEL);+ assert_eq!(+ events[0].amount,+ ai_usage::UsageAmount::Tokens {+ input: 8,+ output: 1290+ }+ );+ }+}++#[tokio::test]+async fn blocked_prompt_records_reported_input_without_inventing_output() {+ let server = MockServer::start().await;+ Mock::given(method("POST"))+ .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({+ "promptFeedback": { "blockReason": "SAFETY" },+ "usageMetadata": { "promptTokenCount": 12, "totalTokenCount": 12 }+ })))+ .mount(&server)+ .await;+ let recorder = RecordingUsage::default();+ assert!(+ generator(&server)+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &recorder,+ )+ .await+ .is_err()+ );+ let events = recorder.0.lock().unwrap();+ assert_eq!(events.len(), 1);+ assert_eq!(+ events[0].amount,+ ai_usage::UsageAmount::Tokens {+ input: 12,+ output: 0+ }+ );+}++#[tokio::test]+async fn absent_metadata_and_http_errors_do_not_fabricate_usage() {+ for (status, body) in [+ (+ 200,+ serde_json::json!({ "candidates": [{ "content": { "parts": [+ { "inlineData": { "mimeType": "image/png", "data": base64::engine::general_purpose::STANDARD.encode(&*PNG) } }+ ] } }] }),+ ),+ (+ 429,+ serde_json::json!({ "error": { "message": "quota exceeded" } }),+ ),+ ] {+ let server = MockServer::start().await;+ Mock::given(method("POST"))+ .respond_with(ResponseTemplate::new(status).set_body_json(body))+ .mount(&server)+ .await;+ let recorder = RecordingUsage::default();+ let result = generator(&server)+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &recorder,+ )+ .await;+ assert_eq!(result.is_ok(), status == 200);+ assert!(recorder.0.lock().unwrap().is_empty());+ }+}++#[tokio::test]+async fn uses_total_minus_prompt_when_candidate_count_is_absent() {+ let server = MockServer::start().await;+ let mut body = image_response(serde_json::json!([+ { "inlineData": { "mimeType": "image/png", "data": base64::engine::general_purpose::STANDARD.encode(&*PNG) } }+ ]));+ body["usageMetadata"]+ .as_object_mut()+ .unwrap()+ .remove("candidatesTokenCount");+ Mock::given(method("POST"))+ .respond_with(ResponseTemplate::new(200).set_body_json(body))+ .mount(&server)+ .await;+ let recorder = RecordingUsage::default();+ generator(&server)+ .generate_image(+ &request(None),+ &UsageContext::system(ai_usage::AiFeature::ImageGeneration),+ &recorder,+ )+ .await+ .unwrap();+ let events = recorder.0.lock().unwrap();+ assert_eq!(events.len(), 1);+ assert_eq!(+ events[0].amount,+ ai_usage::UsageAmount::Tokens {+ input: 8,+ output: 1290+ }+ );+}diff --git a/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.down.sql b/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.down.sqlnew file mode 100644index 0000000000..48106ee85e--- /dev/null+++ b/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.down.sql@@ -0,0 +1 @@+-- Preserve pricing and recorded costs on rollback; older services ignore this model.diff --git a/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.up.sql b/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.up.sqlnew file mode 100644index 0000000000..3c3e608526--- /dev/null+++ b/crates/macro_db_client/migrations/20261002201436_seed_nanobanana_pricing.up.sql@@ -0,0 +1,6 @@+-- Nano Banana requests IMAGE output only. Standard Gemini API pricing in USD+-- per million tokens: $0.30 for text/image input and $30.00 for image output.+-- https://ai.google.dev/gemini-api/docs/pricing#gemini-2.5-flash-image+INSERT INTO ai_pricing (model, price_per_million_in, price_per_million_out)+VALUES ('gemini-2.5-flash-image', 0.30, 30.00)+ON CONFLICT (model) DO NOTHING;diff --git a/packages/sdk/generated/cognition/types.gen.ts b/packages/sdk/generated/cognition/types.gen.tsindex 0d0cbf3a20..180a4a35e7 100644--- a/packages/sdk/generated/cognition/types.gen.ts+++ b/packages/sdk/generated/cognition/types.gen.ts@@ -42,7 +42,7 @@ export type AiAdmissionErrorBody = {* Everything we use AI for. The wire / DB form of each variant is its* `snake_case` name.*/-export type AiFeature = 'chat' | 'memory' | 'automation' | 'dynamic_completions_api' | 'chat_rename' | 'call_summary' | 'channel_bot' | 'ai_projection' | 'ai_editing' | 'import' | 'agent_session' | 'agent_repository_choice' | 'dictation';+export type AiFeature = 'chat' | 'memory' | 'automation' | 'dynamic_completions_api' | 'chat_rename' | 'call_summary' | 'channel_bot' | 'ai_projection' | 'ai_editing' | 'import' | 'agent_session' | 'agent_repository_choice' | 'dictation' | 'image_generation';/*** A structured part within an assistant message.diff --git a/packages/sdk/specs/cognition.json b/packages/sdk/specs/cognition.jsonindex 85b5cf5a02..ac2f0eec4f 100644--- a/packages/sdk/specs/cognition.json+++ b/packages/sdk/specs/cognition.json@@ -2239,7 +2239,8 @@"import","agent_session","agent_repository_choice",- "dictation"+ "dictation",+ "image_generation"]},"AssistantMessagePart": {diff --git a/services/document_cognition_service/src/main.rs b/services/document_cognition_service/src/main.rsindex b1c63df16e..13f127c807 100644--- a/services/document_cognition_service/src/main.rs+++ b/services/document_cognition_service/src/main.rs@@ -690,6 +690,7 @@ async fn main() -> anyhow::Result<()> {image_generation_tool_context: ai_tools::build_image_generation_tool_context(&document_tool_context,ai_tools::build_image_generator_from_env(),+ recorder.clone(),)?,document_tool_context: document_tool_context.clone(),properties_tool_context: properties_tool_context.clone(),diff --git a/services/mcp_service/src/context.rs b/services/mcp_service/src/context.rsindex 1e641a5c88..327d3ec873 100644--- a/services/mcp_service/src/context.rs+++ b/services/mcp_service/src/context.rs@@ -411,6 +411,9 @@ async fn build_tool_context(args: ToolContextBuildArgs<'_>) -> anyhow::Result<Todb.clone(),);+ let recorder =+ ai_usage::pg_recorder_with_enforcement(db.clone(), config.enable_ai_usage_enforcement);+let tool_context = ToolServiceContext {email_service_client: Arc::new(EmailServiceClientExternal::new(email_service_client.url().to_owned(),@@ -426,6 +429,7 @@ async fn build_tool_context(args: ToolContextBuildArgs<'_>) -> anyhow::Result<Toimage_generation_tool_context: ai_tools::build_image_generation_tool_context(&document_tool_context,ai_tools::build_image_generator_from_env(),+ recorder.clone(),)?,document_tool_context,properties_tool_context,@@ -465,10 +469,7 @@ async fn build_tool_context(args: ToolContextBuildArgs<'_>) -> anyhow::Result<Todb.clone(),config.enable_ai_usage_enforcement,),- recorder: ai_usage::pg_recorder_with_enforcement(- db.clone(),- config.enable_ai_usage_enforcement,- ),+ recorder,usage_context: ai_usage::UsageContext::system(ai_usage::AiFeature::Chat),};