Merge branch 'main' into skill-script-utf8-output

Author: rohityan

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.3.0"
+  ".": "2.4.0"
 }

.github/release-please-config.json

@@ -57,5 +57,5 @@
       ]
     }
   },
-  "last-release-sha": "0cb4c814928f579bfbac9b9e1f95669e4304e089"
+  "last-release-sha": "44d747ed5eaf543b5b8d22e0088f8a7c7eeee846"
 }

CHANGELOG.md

@@ -15,6 +15,7 @@
 from __future__ import annotations
 
 import logging
+from typing import AsyncGenerator
 
 from google.genai import types
 
@@ -443,7 +444,7 @@ async def _run_compaction_for_sliding_window(
     session_service: BaseSessionService,
     *,
     skip_token_compaction: bool = False,
-):
+) -> AsyncGenerator[Event, None]:
   """Runs compaction for SlidingWindowCompactor.
 
   This method implements the sliding window compaction logic. It determines
@@ -521,30 +522,35 @@ async def _run_compaction_for_sliding_window(
   Args:
     app: The application instance.
     session: The session containing events to compact.
-    session_service: The session service for appending events.
+    session_service: The session service, used by the token-threshold fallback.
     skip_token_compaction: Whether to skip token-threshold compaction.
+
+  Yields:
+    The sliding-window compaction event, if one is produced. The caller (the
+    runner loop) is responsible for appending it to the session, so that
+    persistence of this event stays at the runtime's synchronization point.
   """
   events = session.events
   if not events:
-    return None
+    return
 
   config = app.events_compaction_config
   if config is None:
-    return None
+    return
 
   # Prefer token-threshold compaction if configured and triggered.
   if not skip_token_compaction and _has_token_threshold_config(config):
     token_compacted = await _run_compaction_for_token_threshold(
         app, session, session_service
     )
     if token_compacted:
-      return None
+      return
 
   if not _has_sliding_window_config(config):
-    return None
+    return
 
   if config.compaction_interval is None or config.overlap_size is None:
-    return None
+    return
 
   # Find the last compaction event and its range.
   last_compacted_end_timestamp = 0.0
@@ -573,7 +579,7 @@ async def _run_compaction_for_sliding_window(
   ]
 
   if len(new_invocation_ids) < config.compaction_interval:
-    return None  # Not enough new invocations to trigger compaction.
+    return  # Not enough new invocations to trigger compaction.
 
   # Determine the range of invocations to compact.
   # The end of the compaction range is the last of the new invocations.
@@ -613,20 +619,20 @@ async def _run_compaction_for_sliding_window(
       events_to_compact = _longest_self_contained_prefix(events_to_compact)
 
   if not events_to_compact:
-    return None
+    return
 
   if app.root_agent is None:
-    return None
+    return
   _ensure_compaction_summarizer(config=config, agent=app.root_agent)
   if config.summarizer is None:
-    return None
+    return
 
   compaction_event = await _summarize_events_with_trace(
       session=session,
       config=config,
       events_to_compact=events_to_compact,
       trigger='sliding_window',
   )
-  if compaction_event:
-    await session_service.append_event(session=session, event=compaction_event)
   logger.debug('Event compactor finished.')
+  if compaction_event:
+    yield compaction_event

src/google/adk/apps/compaction.py

@@ -1,5 +1,5 @@
 /**
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 class AudioProcessor extends AudioWorkletProcessor {
     constructor() {
         super();
-        this.targetSampleRate = 22000;  // Change to your desired rate
+        this.targetSampleRate = 16000;  // Live API expects 16 kHz PCM input
         this.originalSampleRate = sampleRate; // Browser's sample rate
         this.resampleRatio = this.originalSampleRate / this.targetSampleRate;
     }
@@ -26,7 +26,7 @@ class AudioProcessor extends AudioWorkletProcessor {
         const input = inputs[0];
         if (input.length > 0) {
             let audioData = input[0]; // Get first channel's data
-
+            
             if (this.resampleRatio !== 1) {
                 audioData = this.resample(audioData);
             }
@@ -40,9 +40,15 @@ class AudioProcessor extends AudioWorkletProcessor {
         const newLength = Math.round(audioData.length / this.resampleRatio);
         const resampled = new Float32Array(newLength);
 
+        // Linear interpolation resampling (higher quality than nearest neighbor)
+        const lastIndex = audioData.length - 1;
         for (let i = 0; i < newLength; i++) {
-            const srcIndex = Math.floor(i * this.resampleRatio);
-            resampled[i] = audioData[srcIndex]; // Nearest neighbor resampling
+            const srcPos = i * this.resampleRatio;
+            const srcIndex = Math.floor(srcPos);
+            const nextIndex = Math.min(srcIndex + 1, lastIndex);
+            const frac = srcPos - srcIndex;
+            resampled[i] =
+                audioData[srcIndex] * (1 - frac) + audioData[nextIndex] * frac;
         }
         return resampled;
     }

src/google/adk/cli/browser/assets/audio-processor.js

@@ -1,3 +1,3 @@
 {
   "backendUrl": ""
-}
+}