@agent-native/core 0.175.0 → 0.175.1

package/corpus/templates/clips/desktop/src-tauri/src/native_screen/custom_capture.rs

@@ -12,6 +12,7 @@ use super::*;
 use screencapturekit::error::SCError;
 use screencapturekit::stream::delegate_trait::SCStreamDelegateTrait;
 use std::io::{Seek, SeekFrom, Write};
+use std::sync::RwLock;
 
 /// `AVAssetWriter.status` raw value for `.completed`.
 const AV_WRITER_STATUS_COMPLETED: i64 = 2;
@@ -1011,6 +1012,13 @@ unsafe impl Send for CustomScreenCaptureWriterState {}
 /// keeps receiving samples over the whole recording.
 struct CustomScreenCaptureOutputHandler {
     writer: CustomScreenCaptureWriter,
+    /// Only callbacks from this stream generation may reach the writer. A
+    /// ScreenCaptureKit stream can still have callbacks queued after stop; a
+    /// replacement must discard those stale samples before they corrupt the
+    /// writer's timeline.
+    stream_generation: u64,
+    active_stream_generation: Arc<AtomicU64>,
+    callback_admission: Arc<RwLock<()>>,
     /// At most one temporary Clips writer may mirror this physical producer.
     /// It deliberately lives beside the callback handler rather than the
     /// audio bus: the bus has one producer contract and must never publish a
@@ -1283,12 +1291,61 @@ impl Clone for CustomScreenCaptureWriter {
     }
 }
 
+impl CustomScreenCaptureOutputHandler {
+    fn replacement_stream(&self) -> Self {
+        let _admission = self
+            .callback_admission
+            .write()
+            .unwrap_or_else(|error| error.into_inner());
+        let stream_generation = self.active_stream_generation.fetch_add(1, Ordering::SeqCst) + 1;
+        Self {
+            writer: self.writer.clone(),
+            stream_generation,
+            active_stream_generation: Arc::clone(&self.active_stream_generation),
+            callback_admission: Arc::clone(&self.callback_admission),
+            clip_sink: Arc::clone(&self.clip_sink),
+            recording_enabled: Arc::clone(&self.recording_enabled),
+            mic_ready: self.mic_ready.clone(),
+            watch: Arc::clone(&self.watch),
+        }
+    }
+
+    fn invalidate_stream(&self) {
+        let _admission = self
+            .callback_admission
+            .write()
+            .unwrap_or_else(|error| error.into_inner());
+        self.active_stream_generation.fetch_add(1, Ordering::SeqCst);
+    }
+
+    fn is_current(&self) -> bool {
+        stream_generation_is_current(
+            self.active_stream_generation.load(Ordering::SeqCst),
+            self.stream_generation,
+        )
+    }
+}
+
+fn stream_generation_is_current(active_generation: u64, sample_generation: u64) -> bool {
+    active_generation == sample_generation
+}
+
+fn sample_pts_advances(previous: Option<f64>, current: f64) -> bool {
+    previous.is_none_or(|last| current > last)
+}
+
 impl SCStreamOutputTrait for CustomScreenCaptureOutputHandler {
     fn did_output_sample_buffer(
         &self,
         sample_buffer: screencapturekit::cm::CMSampleBuffer,
         of_type: SCStreamOutputType,
     ) {
+        let Ok(_admission) = self.callback_admission.read() else {
+            return;
+        };
+        if !self.is_current() {
+            return;
+        }
         if matches!(of_type, SCStreamOutputType::Microphone) {
             if let Some(mic_ready) = &self.mic_ready {
                 mic_ready.store(true, Ordering::Relaxed);
@@ -2038,21 +2095,20 @@ impl CustomScreenCaptureWriter {
             }
             return;
         }
-        // Record the timeline BEFORE the append so a failure report describes
-        // the sample that was actually rejected, not the last good one.
         let stats = guard.append_stats.entry(track).or_default();
         let previous_pts = stats.last_pts_seconds;
         if let Some(pts) = pts_seconds {
-            if previous_pts.is_some_and(|last| pts <= last) {
+            if !sample_pts_advances(previous_pts, pts) {
                 stats.pts_regressions += 1;
                 let regressions = stats.pts_regressions;
                 if regressions == 1 || regressions % 100 == 0 {
                     crate::logfile::diagnostic(&format!(
-                        "[capture-health] {track} PTS did not advance: {:.6}s after {:.6}s ({regressions} so far)",
+                        "[capture-health] dropped {track} sample with non-advancing PTS: {:.6}s after {:.6}s ({regressions} so far)",
                         pts,
                         previous_pts.unwrap_or(f64::NAN)
                     ));
                 }
+                return;
             }
             stats.last_pts_seconds = Some(pts);
         }
@@ -3755,6 +3811,7 @@ impl CustomCaptureResume {
     /// hold so it never reads the silence as a stall and rebuilds.
     pub(crate) fn pause(&self) {
         self.watch.set_paused(true);
+        self.handler.invalidate_stream();
         if let Ok(guard) = self.stream.lock() {
             let _ = guard.stop_capture();
         }
@@ -3774,7 +3831,8 @@ impl CustomCaptureResume {
         // timeline. The session stays paused and can be retried — and a retry
         // re-measures `paused_for` from the same (uncleared) pause instant, so
         // advancing the offset here would compound on every failed attempt.
-        let new_stream = build_custom_scstream(&self.params, &self.handler, &self.watch)?;
+        let replacement_handler = self.handler.replacement_stream();
+        let new_stream = build_custom_scstream(&self.params, &replacement_handler, &self.watch)?;
 
         // Apply the pause gap just before the stream starts delivering, so the
         // first rebased frame already skips it. Roll back if startup fails so
@@ -4130,6 +4188,7 @@ fn spawn_capture_watchdog(
             // Stop the dead/wedged stream before starting a replacement so two
             // streams never feed the writer at once. Slow build/start work is
             // done without holding the stream lock.
+            let replacement_handler = handler.replacement_stream();
             if let Ok(guard) = stream.lock() {
                 let _ = guard.stop_capture();
             }
@@ -4137,21 +4196,35 @@ fn spawn_capture_watchdog(
                 return;
             }
 
-            match build_custom_scstream(&params, &handler, &watch).and_then(|s| {
+            match build_custom_scstream(&params, &replacement_handler, &watch).and_then(|s| {
                 s.start_capture()
                     .map(|()| s)
                     .map_err(|e| format!("start_capture failed: {e:?}"))
             }) {
                 Ok(new_stream) => {
-                    if shutdown.load(Ordering::SeqCst)
-                        || writer.appends_closed.load(Ordering::SeqCst)
-                    {
-                        let _ = new_stream.stop_capture();
+                    let mut pending_stream = Some(new_stream);
+                    let install = if let Ok(mut guard) = stream.lock() {
+                        if shutdown.load(Ordering::SeqCst)
+                            || writer.appends_closed.load(Ordering::SeqCst)
+                            || watch.is_paused()
+                            || !replacement_handler.is_current()
+                        {
+                            false
+                        } else {
+                            *guard = pending_stream
+                                .take()
+                                .expect("pending watchdog stream is available");
+                            true
+                        }
+                    } else {
+                        false
+                    };
+                    if !install {
+                        if let Some(stream) = pending_stream {
+                            let _ = stream.stop_capture();
+                        }
                         return;
                     }
-                    if let Ok(mut guard) = stream.lock() {
-                        *guard = new_stream;
-                    }
                     // Discard any stop note the deliberate teardown of the old
                     // stream raised; otherwise a later poll would consume it as
                     // a fresh failure and rebuild the healthy stream again.
@@ -4256,6 +4329,9 @@ pub(crate) fn start_custom_screencapturekit_backend_at(
     let watch = Arc::new(CaptureWatch::new());
     let handler = CustomScreenCaptureOutputHandler {
         writer: writer.clone(),
+        stream_generation: 0,
+        active_stream_generation: Arc::new(AtomicU64::new(0)),
+        callback_admission: Arc::new(RwLock::new(())),
         clip_sink: Arc::clone(&clip_sink),
         recording_enabled: Arc::clone(&recording_enabled),
         mic_ready: mic_ready.clone(),
@@ -4491,6 +4567,20 @@ mod fragment_fence_tests {
         assert_eq!(mixer.compute_safe_end(false), 0);
     }
 
+    #[test]
+    fn replacement_stream_rejects_callbacks_from_the_prior_generation() {
+        assert!(stream_generation_is_current(1, 1));
+        assert!(!stream_generation_is_current(1, 0));
+    }
+
+    #[test]
+    fn timestamp_admission_rejects_equal_and_regressing_samples() {
+        assert!(sample_pts_advances(None, 1.0));
+        assert!(sample_pts_advances(Some(1.0), 1.01));
+        assert!(!sample_pts_advances(Some(1.0), 1.0));
+        assert!(!sample_pts_advances(Some(1.0), 0.99));
+    }
+
     #[test]
     fn clip_sink_gate_orders_prepare_activate_and_logical_close() {
         let gate = ClipSinkGate::new();

package/corpus/templates/clips/server/lib/resumable-upload-provider.ts

@@ -4,7 +4,7 @@ import {
   listFileUploadProviders,
   type FileUploadProvider,
 } from "@agent-native/core/file-upload";
-import { resolveHasBuilderPrivateKey } from "@agent-native/core/server";
+import { hasBuilderApiCredentialCustody } from "@agent-native/core/server";
 
 async function isConfiguredForRequest(
   provider: FileUploadProvider,
@@ -34,7 +34,7 @@ export async function resolveResumableUploadProvider(
 
   if (providerId === builderFileUploadProvider.id) {
     try {
-      if (await resolveHasBuilderPrivateKey()) {
+      if (await hasBuilderApiCredentialCustody()) {
         return builderFileUploadProvider;
       }
     } catch {

package/corpus/templates/clips/server/lib/video-storage.ts

@@ -1,6 +1,6 @@
 import { listFileUploadProviders } from "@agent-native/core/file-upload";
 import {
-  resolveHasBuilderPrivateKey,
+  hasBuilderApiCredentialCustody,
   runWithRequestContext,
 } from "@agent-native/core/server";
 
@@ -51,7 +51,7 @@ export async function hasRequestVideoStorage(
     }
 
     try {
-      return await resolveHasBuilderPrivateKey();
+      return await hasBuilderApiCredentialCustody();
     } catch {
       return false;
     }

package/corpus/templates/forms/app/components/builder/FieldRenderer.tsx

@@ -68,173 +68,178 @@ export function FieldRenderer({
         <p className="text-xs text-muted-foreground">{field.description}</p>
       )}
 
-      {field.type === "text" && (
-        <Input
-          placeholder={field.placeholder || ""}
-          value={(value as string) || ""}
-          onChange={(e) => handleChange(e.target.value)}
-          disabled={disabled}
-        />
-      )}
-
-      {field.type === "email" && (
-        <Input
-          type="email"
-          placeholder={field.placeholder || "you@example.com"}
-          value={(value as string) || ""}
-          onChange={(e) => handleChange(e.target.value)}
-          disabled={disabled}
-        />
-      )}
-
-      {field.type === "number" && (
-        <Input
-          type="number"
-          placeholder={field.placeholder || ""}
-          value={(value as string) || ""}
-          onChange={(e) => handleChange(e.target.value)}
-          min={field.validation?.min}
-          max={field.validation?.max}
-          disabled={disabled}
-        />
-      )}
+      <div
+        inert={preview ? true : undefined}
+        className={preview ? "pointer-events-none" : undefined}
+      >
+        {field.type === "text" && (
+          <Input
+            placeholder={field.placeholder || ""}
+            value={(value as string) || ""}
+            onChange={(e) => handleChange(e.target.value)}
+            disabled={disabled}
+          />
+        )}
+
+        {field.type === "email" && (
+          <Input
+            type="email"
+            placeholder={field.placeholder || "you@example.com"}
+            value={(value as string) || ""}
+            onChange={(e) => handleChange(e.target.value)}
+            disabled={disabled}
+          />
+        )}
+
+        {field.type === "number" && (
+          <Input
+            type="number"
+            placeholder={field.placeholder || ""}
+            value={(value as string) || ""}
+            onChange={(e) => handleChange(e.target.value)}
+            min={field.validation?.min}
+            max={field.validation?.max}
+            disabled={disabled}
+          />
+        )}
+
+        {field.type === "textarea" && (
+          <Textarea
+            placeholder={field.placeholder || ""}
+            value={(value as string) || ""}
+            onChange={(e) => handleChange(e.target.value)}
+            rows={4}
+            disabled={disabled}
+          />
+        )}
 
-      {field.type === "textarea" && (
-        <Textarea
-          placeholder={field.placeholder || ""}
-          value={(value as string) || ""}
-          onChange={(e) => handleChange(e.target.value)}
-          rows={4}
-          disabled={disabled}
-        />
-      )}
+        {field.type === "select" && (
+          <Select
+            value={(value as string) || ""}
+            onValueChange={handleChange}
+            disabled={disabled}
+          >
+            <SelectTrigger>
+              <SelectValue placeholder={field.placeholder || "Select..."} />
+            </SelectTrigger>
+            <SelectContent>
+              {dedupeRenderableOptions(field.options).map((opt, i) => (
+                <SelectItem key={`${opt}-${i}`} value={opt}>
+                  {opt}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        )}
+
+        {field.type === "multiselect" && (
+          <div className="space-y-1">
+            {dedupeRenderableOptions(field.options).map((opt, i) => {
+              const selected = Array.isArray(value) ? value : [];
+              return (
+                <label
+                  key={`${opt}-${i}`}
+                  className="flex items-center gap-2.5 text-sm min-h-[44px] py-1"
+                >
+                  <Checkbox
+                    checked={selected.includes(opt)}
+                    onCheckedChange={(checked) => {
+                      const next = checked
+                        ? [...selected, opt]
+                        : selected.filter((s: string) => s !== opt);
+                      handleChange(next);
+                    }}
+                    disabled={disabled}
+                  />
+                  {opt}
+                </label>
+              );
+            })}
+          </div>
+        )}
 
-      {field.type === "select" && (
-        <Select
-          value={(value as string) || ""}
-          onValueChange={handleChange}
-          disabled={disabled}
-        >
-          <SelectTrigger>
-            <SelectValue placeholder={field.placeholder || "Select..."} />
-          </SelectTrigger>
-          <SelectContent>
+        {field.type === "checkbox" && (
+          <label className="flex items-center gap-2.5 text-sm min-h-[44px]">
+            <Checkbox
+              checked={!!value}
+              onCheckedChange={handleChange}
+              disabled={disabled}
+            />
+            {field.placeholder || field.label}
+          </label>
+        )}
+
+        {field.type === "radio" && (
+          <RadioGroup
+            value={(value as string) || ""}
+            onValueChange={handleChange}
+            disabled={disabled}
+          >
             {dedupeRenderableOptions(field.options).map((opt, i) => (
-              <SelectItem key={`${opt}-${i}`} value={opt}>
-                {opt}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      )}
-
-      {field.type === "multiselect" && (
-        <div className="space-y-1">
-          {dedupeRenderableOptions(field.options).map((opt, i) => {
-            const selected = Array.isArray(value) ? value : [];
-            return (
-              <label
+              <div
                 key={`${opt}-${i}`}
-                className="flex items-center gap-2.5 text-sm min-h-[44px] py-1"
+                className="flex items-center gap-2.5 min-h-[44px]"
               >
-                <Checkbox
-                  checked={selected.includes(opt)}
-                  onCheckedChange={(checked) => {
-                    const next = checked
-                      ? [...selected, opt]
-                      : selected.filter((s: string) => s !== opt);
-                    handleChange(next);
-                  }}
-                  disabled={disabled}
-                />
-                {opt}
-              </label>
-            );
-          })}
-        </div>
-      )}
-
-      {field.type === "checkbox" && (
-        <label className="flex items-center gap-2.5 text-sm min-h-[44px]">
-          <Checkbox
-            checked={!!value}
-            onCheckedChange={handleChange}
+                <RadioGroupItem value={opt} id={`${field.id}-${opt}-${i}`} />
+                <Label
+                  htmlFor={`${field.id}-${opt}-${i}`}
+                  className="font-normal"
+                >
+                  {opt}
+                </Label>
+              </div>
+            ))}
+          </RadioGroup>
+        )}
+
+        {field.type === "date" && (
+          <Input
+            type="date"
+            value={(value as string) || ""}
+            onChange={(e) => handleChange(e.target.value)}
             disabled={disabled}
           />
-          {field.placeholder || field.label}
-        </label>
-      )}
-
-      {field.type === "radio" && (
-        <RadioGroup
-          value={(value as string) || ""}
-          onValueChange={handleChange}
-          disabled={disabled}
-        >
-          {dedupeRenderableOptions(field.options).map((opt, i) => (
-            <div
-              key={`${opt}-${i}`}
-              className="flex items-center gap-2.5 min-h-[44px]"
-            >
-              <RadioGroupItem value={opt} id={`${field.id}-${opt}-${i}`} />
-              <Label
-                htmlFor={`${field.id}-${opt}-${i}`}
-                className="font-normal"
+        )}
+
+        {field.type === "rating" && (
+          <div className="flex gap-0.5 sm:gap-1">
+            {[1, 2, 3, 4, 5].map((star) => (
+              <button
+                key={star}
+                type="button"
+                onClick={() => !disabled && handleChange(star)}
+                className="flex size-11 cursor-pointer items-center justify-center rounded-md p-2 transition-[color,transform] duration-150 ease-out active:scale-[0.96] motion-reduce:active:scale-100 disabled:cursor-not-allowed sm:size-10 sm:p-1.5"
+                disabled={disabled}
+                aria-label={`${star} star${star !== 1 ? "s" : ""}`}
               >
-                {opt}
-              </Label>
-            </div>
-          ))}
-        </RadioGroup>
-      )}
-
-      {field.type === "date" && (
-        <Input
-          type="date"
-          value={(value as string) || ""}
-          onChange={(e) => handleChange(e.target.value)}
-          disabled={disabled}
-        />
-      )}
-
-      {field.type === "rating" && (
-        <div className="flex gap-0.5 sm:gap-1">
-          {[1, 2, 3, 4, 5].map((star) => (
-            <button
-              key={star}
-              type="button"
-              onClick={() => !disabled && handleChange(star)}
-              className="flex size-11 cursor-pointer items-center justify-center rounded-md p-2 transition-[color,transform] duration-150 ease-out active:scale-[0.96] motion-reduce:active:scale-100 disabled:cursor-not-allowed sm:size-10 sm:p-1.5"
+                {(value as number) >= star ? (
+                  <IconStarFilled className="h-7 w-7 text-amber-400 sm:h-6 sm:w-6" />
+                ) : (
+                  <IconStar className="h-7 w-7 text-muted-foreground/30 sm:h-6 sm:w-6" />
+                )}
+              </button>
+            ))}
+          </div>
+        )}
+
+        {field.type === "scale" && (
+          <div className="pt-2">
+            <Slider
+              value={[(value as number) || field.validation?.min || 1]}
+              onValueChange={([v]) => handleChange(v)}
+              min={field.validation?.min || 1}
+              max={field.validation?.max || 10}
+              step={1}
               disabled={disabled}
-              aria-label={`${star} star${star !== 1 ? "s" : ""}`}
-            >
-              {(value as number) >= star ? (
-                <IconStarFilled className="h-7 w-7 text-amber-400 sm:h-6 sm:w-6" />
-              ) : (
-                <IconStar className="h-7 w-7 text-muted-foreground/30 sm:h-6 sm:w-6" />
-              )}
-            </button>
-          ))}
-        </div>
-      )}
-
-      {field.type === "scale" && (
-        <div className="pt-2">
-          <Slider
-            value={[(value as number) || field.validation?.min || 1]}
-            onValueChange={([v]) => handleChange(v)}
-            min={field.validation?.min || 1}
-            max={field.validation?.max || 10}
-            step={1}
-            disabled={disabled}
-          />
-          <div className="flex justify-between text-xs text-muted-foreground mt-1">
-            <span>{field.validation?.min || 1}</span>
-            <span>{String(value ?? "-")}</span>
-            <span>{field.validation?.max || 10}</span>
+            />
+            <div className="flex justify-between text-xs text-muted-foreground mt-1">
+              <span>{field.validation?.min || 1}</span>
+              <span>{String(value ?? "-")}</span>
+              <span>{field.validation?.max || 10}</span>
+            </div>
           </div>
-        </div>
-      )}
+        )}
+      </div>
     </div>
   );
 }

package/corpus/templates/tasks/app/root.tsx

@@ -150,7 +150,6 @@ function AppContent() {
           <ThemeToggleItem />
         </CommandMenu.Group>
       </CommandMenu>
-      <Toaster position="bottom-left" />
       <AppLayout>
         <Outlet />
       </AppLayout>
@@ -161,7 +160,11 @@ function AppContent() {
 export default function Root() {
   const [queryClient] = useState(() => createAgentNativeQueryClient());
   return (
-    <AppProviders queryClient={queryClient} i18n={{ catalog: i18nCatalog }}>
+    <AppProviders
+      queryClient={queryClient}
+      toaster={<Toaster position="bottom-left" />}
+      i18n={{ catalog: i18nCatalog }}
+    >
       <AppToolkitProvider>
         <DbSyncSetup />
         <AppContent />

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
-    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
+    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,9 +77,9 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
-    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
+    error?: undefined;
 }>>;

package/dist/file-upload/builder.d.ts

@@ -1,8 +1,8 @@
 import type { FileUploadProvider } from "./types.js";
 /**
  * Built-in Builder.io file upload provider.
- * Uses the same BUILDER_PRIVATE_KEY as the browser/background-agent flows,
- * so connecting Builder once (via the sidebar "Connect Builder" action)
+ * Uses the same Builder connection as the browser/background-agent flows, so
+ * connecting Builder once (via the sidebar "Connect Builder" action)
  * automatically enables file uploads.
  *
  * Upload API: https://www.builder.io/c/docs/upload-api