@agent-native/core 0.114.8 → 0.114.10

package/corpus/templates/clips/desktop/src/styles.css

@@ -5321,16 +5321,32 @@ body[data-clips-route="recording-pill"] #root {
   background: rgba(26, 26, 26, 0.95);
   color: white;
   box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
+  cursor: grab;
   backdrop-filter: blur(12px);
   -webkit-backdrop-filter: blur(12px);
 }
 
-/* Collapsed (not expanded). Shrinks to dot + waveform; controls revealed via
-   CSS :hover which works at the WebKit level even when the app is unfocused.
-   Top-anchored (not centered) inside the headroom-sized window so the hover
-   reveal of the drag grip grows the capsule strictly DOWNWARD — centering it
-   would split the growth and raise the top edge, sliding buttons up under the
-   cursor and causing misclicks. */
+.pill-inner:active {
+  cursor: grabbing;
+}
+
+.pill-inner:not(.pill-inner-compact) {
+  animation: pill-transcript-in 180ms ease-out;
+}
+
+@keyframes pill-transcript-in {
+  from {
+    opacity: 0;
+    transform: translateY(4px) scale(0.985);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
+/* Collapsed (not expanded). Shrinks to logo + waveform; controls revealed via
+   CSS :hover which works at the WebKit level even when the app is unfocused. */
 .pill-inner-compact {
   width: fit-content;
   height: fit-content;
@@ -5393,9 +5409,7 @@ body[data-clips-route="recording-pill"] #root {
   height: 12px;
 }
 
-/* Collapsed = vertical capsule: clips logo on top, waveform below, whole
-   pill clickable to expand. Detached mode keeps its own horizontal layout, so
-   this only applies to the non-detached collapsed pill. */
+/* Collapsed = vertical capsule: logo on top, waveform below. */
 .pill-inner-compact .pill-header.pill-vertical {
   flex-direction: column;
   gap: 0;
@@ -5416,20 +5430,11 @@ body[data-clips-route="recording-pill"] #root {
 }
 
 .pill-vertical .pill-wave-canvas {
-  height: 18px;
-  width: 18px;
-}
-
-/* Dual-stream (mic + system audio) stacked in the collapsed capsule. */
-.pill-vertical .pill-wave-dual {
-  height: 26px;
-  width: 18px;
-  gap: 1px;
+  height: 22px;
+  width: 22px;
 }
 
-/* Wrapper around logo + waveform. Transparent in row layouts (expanded /
-   detached); a real, clickable box only in the collapsed vertical capsule —
-   clicking it expands the pill, and hovering tints it. */
+/* Wrapper around logo + waveform. */
 .pill-media {
   display: contents;
 }
@@ -5440,9 +5445,7 @@ body[data-clips-route="recording-pill"] #root {
   align-items: center;
   align-self: stretch;
   gap: 5px;
-  /* Padding + equal negative margin: the hover highlight covers the whole
-     upper region (to the top + side edges of the capsule) while leaving the
-     logo/waveform in their original positions. */
+  /* The compact media area is the click-to-expand target. */
   padding: 11px 7px 4px;
   margin: -11px -7px 0;
   border-radius: 18px 18px 0 0;
@@ -5455,62 +5458,12 @@ body[data-clips-route="recording-pill"] #root {
   background: rgba(255, 255, 255, 0.08);
 }
 
-/* Drag grip revealed at the bottom of the collapsed capsule on hover. The
-   pill grows downward to fit it (window is sized with headroom for this).
-   Dragging the pill is wired on the whole window; this is the visible
-   affordance and gets its own hover tint. */
-.pill-vertical .pill-vgrip {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 0;
-  margin-top: 0;
-  overflow: hidden;
-  opacity: 0;
-  border-radius: 8px;
-  color: rgba(255, 255, 255, 0.45);
-  cursor: grab;
-  transition:
-    height 140ms ease,
-    margin-top 140ms ease,
-    background 120ms ease,
-    opacity 120ms ease;
-}
-
-.pill-inner-compact:hover .pill-vertical .pill-vgrip,
-.pill-inner-compact.pill-hovered .pill-vertical .pill-vgrip {
-  height: 14px;
-  margin-top: 3px;
-  opacity: 1;
-}
-
-.pill-vertical .pill-vgrip:active {
-  cursor: grabbing;
-}
-
 .pill-timer {
   font-size: 13px;
   font-weight: 500;
   font-variant-numeric: tabular-nums;
 }
 
-.pill-wave-dual {
-  display: flex;
-  height: 26px;
-  width: 48px;
-  flex-shrink: 0;
-  flex-direction: column;
-  align-items: stretch;
-  gap: 2px;
-}
-
-.pill-wave-canvas-half {
-  width: 100%;
-  flex: 1;
-  min-height: 0;
-  display: block;
-}
-
 .pill-wave-canvas {
   height: 26px;
   width: 48px;
@@ -5564,24 +5517,6 @@ body[data-clips-route="recording-pill"] #root {
   background: rgba(255, 255, 255, 0.1);
 }
 
-.pill-drag-handle {
-  position: absolute;
-  bottom: 4px;
-  left: 50%;
-  transform: translateX(-50%);
-  height: 4px;
-  width: 40px;
-  cursor: pointer;
-  border-radius: 999px;
-  background: rgba(255, 255, 255, 0.3);
-  border: none;
-  transition: background 120ms;
-}
-
-.pill-drag-handle:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
-
 /* Whisper model status row in Settings */
 
 .whisper-status {
@@ -5707,29 +5642,6 @@ body[data-clips-route="recording-pill"] #root {
   overflow: hidden;
 }
 
-/* Meeting mode: transcript + notes side by side. */
-.pill-split {
-  display: flex;
-  flex: 1;
-  min-height: 0;
-  overflow: hidden;
-}
-
-.pill-split-pane {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 50%;
-  min-width: 0;
-  min-height: 0;
-}
-
-.pill-split-divider {
-  width: 1px;
-  flex-shrink: 0;
-  margin: 8px 0;
-  background: rgba(255, 255, 255, 0.1);
-}
-
 .pill-pane-label {
   flex-shrink: 0;
   padding: 8px 12px 2px;
@@ -5772,36 +5684,6 @@ body[data-clips-route="recording-pill"] #root {
   cursor: default;
 }
 
-/* In the split, the transcript area should fill its pane below the label. */
-.pill-split-pane .pill-transcript-area {
-  flex: 1;
-  min-height: 0;
-}
-
-.pill-notes-area {
-  min-height: 0;
-  flex: 1;
-  display: flex;
-  overflow: hidden;
-  padding: 4px 12px 8px;
-}
-
-.pill-notes-textarea {
-  flex: 1;
-  background: transparent;
-  border: none;
-  outline: none;
-  resize: none;
-  color: #f5f5f5;
-  font-size: 12px;
-  line-height: 1.5;
-  font-family: inherit;
-}
-
-.pill-notes-textarea::placeholder {
-  color: #71717a;
-}
-
 .pill-saved-bar {
   flex-shrink: 0;
   display: flex;

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

@@ -9,7 +9,7 @@
 //!
 //! Two visual modes (driven entirely from the React side via the URL hash):
 //!
-//!   - `meeting`  — meeting-aware pill with mic + speaker waveforms.
+//!   - `meeting`  — meeting-aware pill with a combined audio meter.
 //!   - `clip`     — solid-mic pill for non-meeting recording sessions.
 //!
 //! The pill is used by meeting-aware recordings and Wispr-style voice
@@ -68,9 +68,9 @@ static PILL_HOVER_TRACKING: AtomicBool = AtomicBool::new(false);
 /// expanded form stretches horizontally to fit the live-transcript area.
 const PILL_W_LOGICAL: u32 = 38;
 const PILL_W_EXPANDED_LOGICAL: u32 = 480;
-/// Meeting mode expands wider so the live transcript and the notes editor sit
-/// side by side without either column feeling cramped.
-const PILL_W_EXPANDED_MEETING_LOGICAL: u32 = 720;
+/// Meeting mode uses the same focused transcript width as other recordings;
+/// live notes are intentionally kept out of this compact overlay.
+const PILL_W_EXPANDED_MEETING_LOGICAL: u32 = 480;
 const PILL_H_LOGICAL: u32 = 92;
 const PILL_H_EXPANDED_LOGICAL: u32 = 340;
 /// Bottom margin from the screen edge, logical px. Granola uses ~24.
@@ -240,9 +240,8 @@ fn pill_content_size_physical(app: &AppHandle, expanded: bool) -> (u32, u32) {
     let (w_log, h_log) = if detached {
         (PILL_DETACHED_W_LOGICAL, PILL_DETACHED_H_LOGICAL)
     } else if expanded {
-        // Meeting mode (right-side anchor) expands wide enough for the
-        // transcript + notes split; plain clip recordings keep the narrower
-        // transcript-only width.
+        // Meeting mode (right-side anchor) keeps a focused transcript-only
+        // panel; plain clip recordings use the same width today.
         let w = if PILL_RIGHT_SIDE.load(Ordering::Relaxed) {
             PILL_W_EXPANDED_MEETING_LOGICAL
         } else {

package/corpus/templates/clips/server/lib/agent-recording-access.ts

@@ -0,0 +1,73 @@
+import { getRequestUserEmail } from "@agent-native/core/server/request-context";
+import { accessFilter } from "@agent-native/core/sharing";
+import { and, eq, or, sql, type SQL } from "drizzle-orm";
+
+type AgentRecordingAccessOptions = {
+  agentOnly?: boolean;
+  userEmail?: string;
+};
+
+export function isAgentRecordingCaller(caller: string | undefined): boolean {
+  return caller === "tool" || caller === "mcp" || caller === "a2a";
+}
+
+function normalizeEmail(email: string | undefined): string | null {
+  const normalized = email?.trim().toLowerCase();
+  return normalized || null;
+}
+
+/**
+ * Scope agent recording reads to normal access plus public recordings the
+ * current signed-in user has already opened. Public visibility alone never
+ * makes a recording discoverable, but explicit user and organization shares
+ * remain discoverable.
+ */
+export function agentRecordingAccessFilter(
+  resourceTable: any,
+  sharesTable: any,
+  viewersTable: any,
+  options: AgentRecordingAccessOptions = {},
+): SQL {
+  const normalAccess = accessFilter(resourceTable, sharesTable);
+  if (!options.agentOnly) return normalAccess;
+
+  const normalizedEmail = normalizeEmail(
+    options.userEmail ?? getRequestUserEmail(),
+  );
+  if (!normalizedEmail) return sql`1 = 0`;
+
+  const viewed = sql`exists (select 1 from ${viewersTable}
+                    where ${viewersTable.recordingId} = ${resourceTable.id}
+                      and lower(${viewersTable.viewerEmail}) = ${normalizedEmail})`;
+  const owner = sql`lower(${resourceTable.ownerEmail}) = ${normalizedEmail}`;
+
+  return (
+    or(
+      owner,
+      normalAccess,
+      and(eq(resourceTable.visibility, "public"), viewed),
+    ) ?? normalAccess
+  );
+}
+
+export async function hasViewedPublicRecording(
+  db: any,
+  viewersTable: any,
+  recordingId: string,
+  userEmail = getRequestUserEmail(),
+): Promise<boolean> {
+  const normalizedEmail = normalizeEmail(userEmail);
+  if (!normalizedEmail) return false;
+
+  const [viewer] = await db
+    .select({ id: viewersTable.id })
+    .from(viewersTable)
+    .where(
+      and(
+        eq(viewersTable.recordingId, recordingId),
+        sql`lower(${viewersTable.viewerEmail}) = ${normalizedEmail}`,
+      ),
+    )
+    .limit(1);
+  return Boolean(viewer);
+}

package/corpus/templates/clips/server/plugins/agent-chat.ts

@@ -42,7 +42,10 @@ export default createAgentChatPlugin({
   initialToolNames: INITIAL_TOOL_NAMES,
   extraContext: async () =>
     `<clips-transcript-guidance>
-The transcript in view-screen is a bounded preview. When previewTruncated is true, its text is expected to end mid-sentence and is never evidence that transcription stopped early. Call get-recording-player-data before judging transcript completeness or quoting the full transcript. For a failed or pending transcript, use request-transcript with force=true. For an explicit fresh retry of an existing ready transcript, also pass regenerate=true. Agent-triggered retries are queued for the durable worker and return pending while processing.
-</clips-transcript-guidance>`,
+The transcript in view-screen and get-recording-player-data are bounded previews when called by the agent. When previewTruncated is true, the text is expected to end mid-sentence and is never evidence that transcription stopped early. Use the bounded payload for a concise summary and do not request or reconstruct the omitted transcript by searching other recordings. For a failed or pending transcript, use request-transcript with force=true. For an explicit fresh retry of an existing ready transcript, also pass regenerate=true. Agent-triggered retries are queued for the durable worker and return pending while processing.
+</clips-transcript-guidance>
+<clips-recording-discovery>
+Clips public recordings are unlisted-by-link, not a searchable public catalog. Treat a recording as known only when it is owned by the current user, already appears in the current screen, or the current user has already viewed it. Do not use list-recordings or search-recordings to discover someone else's clips, recover from a failed direct lookup, answer a date/time question, or search by a title that was not supplied by the user. A question such as when this clip was created refers to the clip already in context; answer it from current-screen or get-recording-player-data. If a direct recording lookup fails, report the failure and stop instead of broadening the search. Only inspect another clip when the user provides its share URL or recording id in the request.
+</clips-recording-discovery>`,
   resolveOrgId: async (event) => (await getOrgContext(event)).orgId,
 });

package/corpus/templates/plan/app/lib/plan-local-bridge.ts

@@ -480,6 +480,24 @@ export async function fetchLocalPlanBridgeBundle(
   return localPlanBridgePayloadToBundle(payload, fallbackSlug);
 }
 
+export async function fetchLocalPlanBridgeComments(
+  bridgeUrl: string,
+): Promise<LocalPlanBundle["comments"]> {
+  const response = await fetch(localPlanBridgeCommentsUrl(bridgeUrl), {
+    cache: "no-store",
+  });
+  const payload = (await response
+    .json()
+    .catch(() => null)) as LocalPlanBridgePayload | null;
+  if (!response.ok || !payload?.ok) {
+    throw new Error(
+      payload?.error ||
+        `Local plan bridge returned ${response.status || "an error"}.`,
+    );
+  }
+  return (payload.comments ?? []).filter((comment) => !comment.deletedAt);
+}
+
 export async function updateLocalPlanBridgeComments(
   bridgeUrl: string,
   fallbackSlug: string,

package/corpus/templates/plan/app/pages/PlansPage.tsx

@@ -270,6 +270,7 @@ import {
 } from "@/lib/plan-comment-editor-helpers";
 import { planDocumentTitle } from "@/lib/plan-document-title";
 import {
+  fetchLocalPlanBridgeComments,
   fetchLocalPlanBridgeBundle,
   localNetworkAccessPermissionState,
   localPlanBridgeUrlFromLocation,
@@ -2082,26 +2083,24 @@ export function PlansPage({ localPlanSlug }: { localPlanSlug?: string } = {}) {
   );
   // Bridge bundles carry no comments; load comments.json from the colocated
   // folder so they render and survive refresh in bridge mode too.
-  const localPlanBridgeCommentsQuery = useActionQuery<LocalPlanBundle>(
-    "get-local-plan-folder",
-    localPlanBundleQueryParams(localPlanSlug ?? "", localPlanRepoPath),
-    {
-      enabled: localPlanMode && Boolean(localPlanSlug && localPlanBridgeUrl),
-      refetchInterval: false,
-      retry: false,
-    },
-  );
+  const localPlanBridgeCommentsQuery = useQuery<LocalPlanBundle["comments"]>({
+    queryKey: ["local-plan-bridge-comments", localPlanBridgeUrl],
+    enabled: localPlanMode && Boolean(localPlanSlug && localPlanBridgeUrl),
+    refetchInterval: false,
+    retry: false,
+    queryFn: () => fetchLocalPlanBridgeComments(localPlanBridgeUrl ?? ""),
+  });
   const localPlanData = useMemo(
     () =>
       localPlanBridgeUrl
         ? mergeLocalBridgeComments(
             localPlanBridgeQuery.data,
-            localPlanBridgeCommentsQuery.data?.comments,
+            localPlanBridgeCommentsQuery.data,
           )
         : localPlanQuery.data,
     [
       localPlanBridgeQuery.data,
-      localPlanBridgeCommentsQuery.data?.comments,
+      localPlanBridgeCommentsQuery.data,
       localPlanBridgeUrl,
       localPlanQuery.data,
     ],

package/corpus/templates/plan/changelog/2026-07-20-bridged-local-plans-now-load-comments-from-the-local-workspace.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-20
+---
+
+Bridged local plans now load comments from the local workspace.

package/dist/agent/engine/ai-sdk-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-sdk-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/ai-sdk-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAW7E,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMxD,QAAA,MAAM,qBAAqB,EAAE,MAAM,CAAC,aAAa,EAAE,kBAAkB,CAyDpE,CAAC;AAMF,QAAA,MAAM,uBAAuB,EAKxB,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAEnC,QAAA,MAAM,yBAAyB,EAKf,MAAM,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;AAEzD,QAAA,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAStD,CAAC;AAEF,QAAA,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CASpD,CAAC;AA4CF,kDAAkD;AAClD,MAAM,WAAW,iBAAiB;IAChC,sFAAsF;IACtF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0GAA0G;IAC1G,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA+SD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,aAAa,EACvB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,WAAW,CAEb;AA8CD,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,EACzB,iBAAiB,EACjB,iBAAiB,GAClB,CAAC"}
+{"version":3,"file":"ai-sdk-engine.d.ts","sourceRoot":"","sources":["../../../src/agent/engine/ai-sdk-engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAYH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAe7E,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,YAAY,CAAC;AAEpB,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAMxD,QAAA,MAAM,qBAAqB,EAAE,MAAM,CAAC,aAAa,EAAE,kBAAkB,CAyDpE,CAAC;AAMF,QAAA,MAAM,uBAAuB,EAKxB,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAEnC,QAAA,MAAM,yBAAyB,EAKf,MAAM,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;AAEzD,QAAA,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAStD,CAAC;AAEF,QAAA,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CASpD,CAAC;AA4CF,kDAAkD;AAClD,MAAM,WAAW,iBAAiB;IAChC,sFAAsF;IACtF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0GAA0G;IAC1G,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAuUD,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,aAAa,EACvB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,WAAW,CAEb;AA8CD,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,EACzB,iBAAiB,EACjB,iBAAiB,GAClB,CAAC"}

package/dist/agent/engine/ai-sdk-engine.js

@@ -14,6 +14,7 @@
 import { clearProviderCredentialAuthFailure, readDeployCredentialEnv, recordProviderCredentialAuthFailure, } from "../../server/credential-provider.js";
 import { anthropicManualThinkingBudget, normalizeReasoningEffortForModel, supportsClaudeAdaptiveThinking, } from "../../shared/reasoning-effort.js";
 import { AI_SDK_MODEL_CONFIG } from "../model-config.js";
+import { createFirstEventAbortController, FIRST_STREAM_EVENT_TIMEOUT_MS, } from "./first-event-timeout.js";
 import { clampThinkingBudgetTokens, resolveMaxOutputTokensForEngine, } from "./output-tokens.js";
 import { engineToolsToAISDK, engineMessagesToAISDK, aiSdkPartToEngineEvents, aiSdkStepToAssistantContent, } from "./translate-ai-sdk.js";
 // ---------------------------------------------------------------------------
@@ -299,6 +300,7 @@ class AISDKEngine {
             }
         }
         let assistantContent = [];
+        const firstEventAbort = createFirstEventAbortController(opts.abortSignal);
         try {
             const result = streamText({
                 model: providerModel,
@@ -309,7 +311,7 @@ class AISDKEngine {
                 ...(opts.temperature !== undefined
                     ? { temperature: opts.temperature }
                     : {}),
-                abortSignal: opts.abortSignal,
+                abortSignal: firstEventAbort.signal,
                 onStepFinish: (step) => {
                     assistantContent = aiSdkStepToAssistantContent(step);
                 },
@@ -320,7 +322,17 @@ class AISDKEngine {
             // Buffer the terminal stop so assistant-content can be emitted just
             // before it, regardless of where `finish` arrives in the stream.
             let bufferedStop;
+            let sawFirstEvent = false;
             for await (const part of result.fullStream) {
+                // "start" is a synthetic lifecycle marker the AI SDK enqueues
+                // synchronously when the stream begins — before any provider bytes
+                // arrive — so it does not count as real progress. Every other part
+                // (including "start-step", only enqueued on the step's first real
+                // chunk) proves the provider is actually responding.
+                if (!sawFirstEvent && part?.type !== "start") {
+                    sawFirstEvent = true;
+                    firstEventAbort.markFirstEvent();
+                }
                 for (const event of aiSdkPartToEngineEvents(part)) {
                     if (event.type === "stop") {
                         bufferedStop = event;
@@ -330,6 +342,12 @@ class AISDKEngine {
                     }
                 }
             }
+            // AI SDK surfaces an aborted stream as a graceful `{type: "abort"}`
+            // part rather than a thrown error, so a first-event timeout would
+            // otherwise fall through to the normal end_turn completion below.
+            if (!sawFirstEvent && firstEventAbort.didTimeout()) {
+                throw new Error(`Model request produced no stream events within ${FIRST_STREAM_EVENT_TIMEOUT_MS / 1000}s; the connection appears wedged.`);
+            }
             yield { type: "assistant-content", parts: assistantContent };
             await clearProviderCredentialAuthFailure({
                 key: PROVIDER_ENV_VARS[this.provider][0],
@@ -338,16 +356,18 @@ class AISDKEngine {
             yield bufferedStop ?? { type: "stop", reason: "end_turn" };
         }
         catch (err) {
+            const timedOut = firstEventAbort.didTimeout();
             // Surface structured fields from AI SDK's APICallError so
             // isRetryableError can check statusCode/providerRetryable directly
             // rather than keyword-matching the message string.
             const statusCode = typeof err?.statusCode === "number" ? err.statusCode : undefined;
             const errorMessage = err?.message ?? String(err);
-            const isConnectionError = statusCode === undefined &&
+            const isConnectionError = !timedOut &&
+                statusCode === undefined &&
                 String(errorMessage).trim().toLowerCase() === "connection error.";
             const providerRetryable = typeof err?.isRetryable === "boolean"
                 ? err.isRetryable
-                : isConnectionError
+                : isConnectionError || timedOut
                     ? true
                     : undefined;
             if (statusCode === 401) {
@@ -370,13 +390,16 @@ class AISDKEngine {
                 // auto-resume too — matching the Builder gateway path.
                 ...(statusCode !== undefined
                     ? { errorCode: `http_${statusCode}`, statusCode }
-                    : isConnectionError
+                    : isConnectionError || timedOut
                         ? { errorCode: "provider_network_error" }
                         : {}),
                 ...(providerRetryable !== undefined ? { providerRetryable } : {}),
             };
             throw err;
         }
+        finally {
+            firstEventAbort.cleanup();
+        }
     }
     async createProviderModel(model) {
         const pkg = PROVIDER_PACKAGES[this.provider];