@agent-native/core 0.114.6 → 0.114.7

package/corpus/templates/clips/desktop/src-tauri/src/util.rs

@@ -15,10 +15,10 @@ const POPOVER_DEFAULT_HEIGHT_LOGICAL: f64 = 520.0;
 //
 // Clips-owned recording chrome (toolbar / countdown / finalizing /
 // recording-pill) gets `NSWindow.sharingType = NSWindowSharingNone` so it does
-// not leak into the recorded video. The main popover is different: users expect
-// to screenshot it for feedback, so it stays shareable during normal idle /
-// settings use and is flipped to NSWindowSharingNone only while it is parked as
-// the hidden recording controller.
+// not leak into the recorded video. The main popover follows the same user
+// preference: private by default, shareable only when "Show Clips in screen
+// captures" is enabled. Reopening it during a recording must not silently
+// override that choice.
 // Recording-time exclusion has two effects on macOS: screen pickers don't list
 // excluded windows, and full-screen captures omit them from the compositor
 // output. This is the same mechanism Loom, 1Password, and CleanShot use to keep
@@ -183,12 +183,9 @@ pub fn set_capture_included(_window: &WebviewWindow) {
 /// immediately on anything currently on screen. Called from
 /// `set_feature_config` when the toggle flips.
 ///
-/// The popover is intentionally skipped — its sharing-type is dynamic
-/// (`set_capture_included` while shown, `set_capture_excluded` while
-/// parked at 2x2 px during recording). Both of those helpers now consult
-/// the toggle, so the next `show_popover` / `park_popover_offscreen` call
-/// picks up the new setting. Rewriting it here would clobber the parked
-/// state mid-recording.
+/// The popover follows the same preference as ordinary Clips chrome. Applying
+/// it here makes the toggle take effect immediately whether the popover is
+/// visible or parked as the 2x2 recording controller.
 ///
 /// Region-guide overlays are private recorder aids, not Clips chrome demos, so
 /// they stay excluded even when the debug toggle makes the rest visible.
@@ -198,9 +195,6 @@ pub fn reapply_capture_exclusion_to_overlays(app: &tauri::AppHandle) {
         let visible = crate::config::show_in_screen_capture(app);
         let windows = app.webview_windows();
         for (label, window) in &windows {
-            if label.as_str() == "popover" {
-                continue;
-            }
             // The meeting reminder is a notification, not Clips recording
             // chrome — keep it visible in captures regardless of the debug
             // toggle so it never gets re-excluded on a config change.

package/corpus/templates/clips/desktop/src-tauri/src/whisper_speech.rs

@@ -16,6 +16,36 @@
 //!
 use tauri::AppHandle;
 
+/// One timestamped segment produced by bounded, offline-file transcription.
+/// Timestamps are relative to the supplied audio, never to wall-clock time.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct OfflineTranscriptSegment {
+    pub start_ms: i64,
+    pub end_ms: i64,
+    pub text: String,
+}
+
+/// Transcribe already-decoded 16 kHz mono samples with the process-wide
+/// Whisper context. This is the reusable file-transcription entry point: the
+/// caller owns container decoding and the samples are never persisted here.
+///
+/// Blocking work -- call from a dedicated worker thread, not the async runtime.
+pub(crate) fn transcribe_offline_file_samples(
+    app: &AppHandle,
+    samples: &[f32],
+    language: Option<&str>,
+) -> Result<Vec<OfflineTranscriptSegment>, String> {
+    #[cfg(target_os = "macos")]
+    {
+        macos::transcribe_offline_file_samples(app, samples, language)
+    }
+    #[cfg(not(target_os = "macos"))]
+    {
+        let _ = (app, samples, language);
+        Err("local Whisper file transcription is supported on macOS only".to_owned())
+    }
+}
+
 #[tauri::command]
 pub async fn whisper_transcription_start(
     app: AppHandle,
@@ -112,6 +142,9 @@ mod macos {
     use tauri::{AppHandle, Emitter};
     use whisper_rs::{FullParams, SamplingStrategy, WhisperContext, WhisperContextParameters};
 
+    use crate::capture_audio_bus::{
+        try_subscribe, AudioSources, AudioSubscription, SubscriptionAttempt,
+    };
     use crate::native_speech::macos::{
         start_raw_mic_capture, MicVoiceProcessingMode, RawMicCapture,
     };
@@ -121,6 +154,8 @@ mod macos {
     };
     use crate::whisper_model::{ensure_model, model_file};
 
+    const MEETING_AUDIO_OWNER: &str = "meeting-whisper";
+
     /// One transcript segment with real timestamps from whisper, already
     /// offset onto the meeting timeline (ms since capture start).
     #[derive(Serialize, Clone)]
@@ -185,6 +220,31 @@ mod macos {
         Ok(())
     }
 
+    pub(super) fn transcribe_offline_file_samples(
+        app: &AppHandle,
+        samples: &[f32],
+        language: Option<&str>,
+    ) -> Result<Vec<super::OfflineTranscriptSegment>, String> {
+        const CHUNK_SAMPLES: usize = 25 * 16_000;
+
+        let ctx = context(app)?;
+        let mut state = ctx
+            .create_state()
+            .map_err(|e| format!("whisper state init failed: {e}"))?;
+        let mut segments = Vec::new();
+        for (chunk_index, chunk) in samples.chunks(CHUNK_SAMPLES).enumerate() {
+            let chunk_offset_ms = chunk_index as i64 * 25_000;
+            segments.extend(infer(&mut state, chunk, language).into_iter().map(
+                |(start_ms, end_ms, text)| super::OfflineTranscriptSegment {
+                    start_ms: chunk_offset_ms.saturating_add(start_ms),
+                    end_ms: chunk_offset_ms.saturating_add(end_ms),
+                    text,
+                },
+            ));
+        }
+        Ok(segments)
+    }
+
     // ---- resampling -------------------------------------------------------
 
     /// One linearly-interpolated 16 kHz output sample at output index `i`,
@@ -383,6 +443,12 @@ mod macos {
         /// deliberately deferred to the worker so we never allocate/compute on
         /// the realtime audio thread.
         fn push(&self, frames: &[f32]) {
+            // A bus publish may already have cloned this callback when the
+            // subscription is dropped. Refuse that final in-flight delivery
+            // once teardown has signalled the worker to stop.
+            if !self.running.load(Ordering::SeqCst) {
+                return;
+            }
             if let Ok(mut buf) = self.buf.lock() {
                 buf.extend_from_slice(frames);
             }
@@ -826,18 +892,31 @@ mod macos {
     }
 
     struct Session {
+        app: AppHandle,
         // macOS 15+ meetings use a combined SCK capture, so there is no
         // competing AVAudioEngine / VoiceProcessingIO mic input to stop.
         mic_cap: Option<RawMicCapture>,
         // System capture is optional — skipped when the user turns system
         // audio off, so neither the recording nor the transcript include it.
         sys_cap: Option<RawSckAudioCapture>,
+        // When Rewind already owns the requested SCK audio sources, meeting
+        // Whisper receives fan-out PCM through this subscription and opens no
+        // physical mic/system recorder of its own.
+        _shared_audio: Option<AudioSubscription>,
+        temporary_audio: Option<crate::screen_memory::TemporaryAudioLease>,
         mic: Arc<WhisperStream>,
         sys: Option<Arc<WhisperStream>>,
         /// Who started this session — see `SessionOwner`.
         owner: SessionOwner,
     }
 
+    impl Drop for Session {
+        fn drop(&mut self) {
+            drop(self._shared_audio.take());
+            release_temporary_audio(&self.app, self.temporary_audio.take());
+        }
+    }
+
     // SAFETY: the capture handles hold refcounted ObjC objects (already
     // `Send`); the streams are `Arc` over `Send + Sync` interiors. We only move
     // the session through the `Mutex`, never alias across threads.
@@ -936,10 +1015,80 @@ mod macos {
                     as Arc<dyn Fn(&[f32]) + Send + Sync>
             });
 
-        let combined_cap = if should_use_combined_sck_capture(
-            owner,
-            supports_sck_microphone_capture(),
-        ) {
+        // If Rewind is running visuals-only, upgrade that one physical
+        // producer before touching the bus. Off/paused Rewind returns no lease
+        // and preserves the legacy meeting capture path.
+        let temporary_audio = if owner == SessionOwner::Meeting {
+            match crate::screen_memory::acquire_temporary_audio_consumer(
+                &app,
+                MEETING_AUDIO_OWNER,
+                crate::capture_graph::CaptureConsumer::Meeting,
+                true,
+                capture_system,
+            ) {
+                Ok(lease) => lease,
+                Err(error) => {
+                    mic_stream.stop();
+                    if let Some(sys_stream) = &sys_stream {
+                        sys_stream.stop();
+                    }
+                    return Err(error);
+                }
+            }
+        } else {
+            None
+        };
+
+        // Make the shared-vs-physical choice atomically inside the bus. If a
+        // Rewind producer exists but lacks a requested source, `try_subscribe`
+        // returns a typed error and we fail closed: no combined SCK fallback,
+        // RawMicCapture, or raw system capture is opened.
+        let shared_audio = if owner == SessionOwner::Meeting {
+            let mic_for_shared = mic_stream.clone();
+            let shared_mic = Arc::new(move |samples: &[f32], sample_rate: f64| {
+                mic_for_shared.set_src_rate(sample_rate);
+                mic_for_shared.push(samples);
+            });
+            let shared_system = sys_stream.as_ref().map(|stream| {
+                let stream = stream.clone();
+                Arc::new(move |samples: &[f32], sample_rate: f64| {
+                    stream.set_src_rate(sample_rate);
+                    stream.push(samples);
+                }) as crate::capture_audio_bus::AudioCallback
+            });
+            match try_subscribe(
+                AudioSources::new(true, capture_system),
+                Some(shared_mic),
+                shared_system,
+            ) {
+                Ok(SubscriptionAttempt::Subscribed(subscription)) => Some(subscription),
+                Ok(SubscriptionAttempt::NoProducer) => {
+                    if temporary_audio.is_some() {
+                        release_temporary_audio(&app, temporary_audio);
+                        mic_stream.stop();
+                        if let Some(sys_stream) = &sys_stream {
+                            sys_stream.stop();
+                        }
+                        return Err("shared-audio-producer-unavailable-after-upgrade".into());
+                    }
+                    None
+                }
+                Err(error) => {
+                    release_temporary_audio(&app, temporary_audio);
+                    mic_stream.stop();
+                    if let Some(sys_stream) = &sys_stream {
+                        sys_stream.stop();
+                    }
+                    return Err(error.to_string());
+                }
+            }
+        } else {
+            None
+        };
+
+        let combined_cap = if shared_audio.is_none()
+            && should_use_combined_sck_capture(owner, supports_sck_microphone_capture())
+        {
             match start_raw_meeting_capture(
                 app.clone(),
                 mic_device_id.clone(),
@@ -963,7 +1112,10 @@ mod macos {
             None
         };
 
-        let (mic_cap, sys_cap) = if let Some(combined_cap) = combined_cap {
+        let (mic_cap, sys_cap) = if shared_audio.is_some() {
+            eprintln!("[whisper] using shared Rewind microphone/system PCM producer");
+            (None, None)
+        } else if let Some(combined_cap) = combined_cap {
             // Both SCK outputs are configured at 48 kHz.
             mic_stream.set_src_rate(48000.0);
             (None, Some(combined_cap))
@@ -1004,10 +1156,30 @@ mod macos {
             (Some(mic_cap), sys_cap)
         };
 
-        let mut slot = session_slot().lock().map_err(|e| e.to_string())?;
+        let mut slot = match session_slot().lock() {
+            Ok(slot) => slot,
+            Err(error) => {
+                drop(shared_audio);
+                release_temporary_audio(&app, temporary_audio);
+                mic_stream.stop();
+                if let Some(sys_stream) = &sys_stream {
+                    sys_stream.stop();
+                }
+                if let Some(mic_cap) = mic_cap {
+                    mic_cap.stop();
+                }
+                if let Some(sys_cap) = sys_cap {
+                    sys_cap.stop();
+                }
+                return Err(error.to_string());
+            }
+        };
         *slot = Some(Session {
+            app: app.clone(),
             mic_cap,
             sys_cap,
+            _shared_audio: shared_audio,
+            temporary_audio,
             mic: mic_stream,
             sys: sys_stream,
             owner,
@@ -1039,12 +1211,23 @@ mod macos {
         eprintln!("[whisper] transcription timeline reset");
     }
 
-    pub fn stop(_app: &AppHandle) {
+    fn release_temporary_audio(
+        app: &AppHandle,
+        lease: Option<crate::screen_memory::TemporaryAudioLease>,
+    ) {
+        if let Some(lease) = lease {
+            if let Err(error) = crate::screen_memory::release_temporary_audio_consumer(app, lease) {
+                eprintln!("[whisper] Rewind audio lease release failed: {error}");
+            }
+        }
+    }
+
+    pub fn stop(app: &AppHandle) {
         let session = match session_slot().lock() {
             Ok(mut slot) => slot.take(),
-            Err(_) => return,
+            Err(poisoned) => poisoned.into_inner().take(),
         };
-        let Some(session) = session else {
+        let Some(mut session) = session else {
             return;
         };
         // Signal workers to stop. They flush a final transcript after the loop.
@@ -1053,12 +1236,16 @@ mod macos {
             sys.stop();
         }
         // Stop captures so no more samples arrive while workers flush.
-        if let Some(mic_cap) = session.mic_cap {
+        if let Some(mic_cap) = session.mic_cap.take() {
             mic_cap.stop();
         }
-        if let Some(sys_cap) = session.sys_cap {
+        if let Some(sys_cap) = session.sys_cap.take() {
             sys_cap.stop();
         }
+        // Unsubscribe before a last-consumer release rotates the Rewind
+        // producer back to its persisted visuals-only mode.
+        drop(session._shared_audio.take());
+        release_temporary_audio(app, session.temporary_audio.take());
         // Wait up to 4 s for both workers to finish their final flush so
         // trailing speech is not lost when the frontend unregisters listeners.
         let deadline = Instant::now() + Duration::from_secs(4);

package/corpus/templates/clips/desktop/src-tauri/tauri.alpha.conf.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "Clips Alpha",
+  "identifier": "com.clips.tray.alpha",
+  "bundle": {
+    "createUpdaterArtifacts": false,
+    "targets": ["app"],
+    "macOS": {
+      "minimumSystemVersion": "26.0"
+    }
+  },
+  "plugins": {
+    "updater": {
+      "active": false
+    }
+  }
+}

package/dist/cli/mcp-config-writers.d.ts

@@ -33,7 +33,7 @@ export interface HttpMcpEntry {
 /** Build the HTTP MCP server entry for a deployed agent-native app. */
 export declare function buildHttpMcpEntry(mcpUrl: string, token?: string, headers?: Record<string, string>): HttpMcpEntry;
 export declare function buildHttpMcpEntryForClient(client: ClientId, mcpUrl: string, token?: string, headers?: Record<string, string>): Record<string, unknown>;
-export declare function buildLocalMcpEntryForClient(client: ClientId, args: string[], env?: Record<string, string>): Record<string, unknown>;
+export declare function buildLocalMcpEntryForClient(client: ClientId, args: string[], env?: Record<string, string>, command?: string): Record<string, unknown>;
 /**
  * Cowork consumes MCP exactly like Claude Code (same JSON server-entry
  * shape). Resolved lazily so `os.homedir()` reflects the current `$HOME`.
@@ -78,7 +78,7 @@ export declare function hasJsonMcpEntry(file: string, name: string): boolean;
 export declare function hasJsonMcpEntryForClient(client: ClientId, file: string, name: string): boolean;
 /** Build a `[mcp_servers.<name>]` block for an HTTP-type MCP server. */
 export declare function buildCodexHttpBlock(name: string, mcpUrl: string, token?: string, headers?: Record<string, string>): string;
-export declare function buildCodexLocalBlock(name: string, args: string[], env?: Record<string, string>): string;
+export declare function buildCodexLocalBlock(name: string, args: string[], env?: Record<string, string>, command?: string): string;
 /**
  * Replace (or append) the entire `[mcp_servers.<name>]` footprint in a TOML
  * file without disturbing other content. The footprint is the server's own

package/dist/cli/mcp-config-writers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-config-writers.d.ts","sourceRoot":"","sources":["../../src/cli/mcp-config-writers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-config-writers.d.ts","sourceRoot":"","sources":["../../src/cli/mcp-config-writers.ts"],"names":[],"mappings":"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"}

package/dist/cli/mcp-config-writers.js

@@ -81,12 +81,12 @@ export function buildHttpMcpEntryForClient(client, mcpUrl, token, headers) {
     }
     return buildHttpMcpEntry(mcpUrl, token, headers);
 }
-export function buildLocalMcpEntryForClient(client, args, env) {
+export function buildLocalMcpEntryForClient(client, args, env, command = "agent-native") {
     const cleanEnv = env ? Object.fromEntries(Object.entries(env)) : {};
     if (client === "opencode") {
         return {
             type: "local",
-            command: ["agent-native", ...args],
+            command: [command, ...args],
             enabled: true,
             ...(Object.keys(cleanEnv).length ? { environment: cleanEnv } : {}),
         };
@@ -94,13 +94,13 @@ export function buildLocalMcpEntryForClient(client, args, env) {
     if (client === "github-copilot") {
         return {
             type: "stdio",
-            command: "agent-native",
+            command,
             args,
             ...(Object.keys(cleanEnv).length ? { env: cleanEnv } : {}),
         };
     }
     return {
-        command: "agent-native",
+        command,
         args,
         ...(Object.keys(cleanEnv).length ? { env: cleanEnv } : {}),
     };
@@ -454,9 +454,9 @@ export function buildCodexHttpBlock(name, mcpUrl, token, headers) {
     }
     return lines.join("\n") + "\n";
 }
-export function buildCodexLocalBlock(name, args, env) {
+export function buildCodexLocalBlock(name, args, env, command = "agent-native") {
     const lines = [codexMcpHeader(name)];
-    lines.push(`command = "agent-native"`);
+    lines.push(`command = ${tomlQuote(command)}`);
     lines.push(`args = [${args.map(tomlQuote).join(", ")}]`);
     const cleanEnv = env ? Object.fromEntries(Object.entries(env)) : {};
     if (Object.keys(cleanEnv).length) {