@agent-native/core 0.114.8 → 0.114.10

package/corpus/README.md

@@ -28,6 +28,6 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- core files: 1518
+- core files: 1519
 - toolkit files: 137
-- template files: 6163
+- template files: 6176

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @agent-native/core
 
+## 0.114.10
+
+### Patch Changes
+
+- 687fefc: Capture unexpected HTTP action failures with request-correlated server diagnostics.
+- 687fefc: Capture uncategorized HTTP action failures through the configured server error monitor and correlate them with request telemetry.
+- 687fefc: Abort and retry model requests that produce no stream events within two minutes instead of hanging until run watchdogs fire.
+- 687fefc: Fix nullable organization scope parameters for remote integration stores.
+- 687fefc: Capture truncated, secret-scrubbed tool error text on generation telemetry when `captureToolResults` is enabled.
+- 687fefc: Distinguish ended agent-chat streams from true reconnect stalls in error monitoring and recovery messaging.
+- Updated dependencies [687fefc]
+  - @agent-native/recap-cli@0.4.7
+
+## 0.114.9
+
+### Patch Changes
+
+- fb32d85: Run configurable PR Visual Recap jobs with Bash on every runner platform.
+- Updated dependencies [fb32d85]
+  - @agent-native/recap-cli@0.4.6
+
 ## 0.114.8
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.114.8",
+  "version": "0.114.10",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/agent/engine/ai-sdk-engine.ts

@@ -23,6 +23,10 @@ import {
   supportsClaudeAdaptiveThinking,
 } from "../../shared/reasoning-effort.js";
 import { AI_SDK_MODEL_CONFIG, type AISDKProvider } from "../model-config.js";
+import {
+  createFirstEventAbortController,
+  FIRST_STREAM_EVENT_TIMEOUT_MS,
+} from "./first-event-timeout.js";
 import {
   clampThinkingBudgetTokens,
   resolveMaxOutputTokensForEngine,
@@ -379,6 +383,7 @@ class AISDKEngine implements AgentEngine {
     }
 
     let assistantContent: EngineContentPart[] = [];
+    const firstEventAbort = createFirstEventAbortController(opts.abortSignal);
 
     try {
       const result = streamText({
@@ -390,7 +395,7 @@ class AISDKEngine implements AgentEngine {
         ...(opts.temperature !== undefined
           ? { temperature: opts.temperature }
           : {}),
-        abortSignal: opts.abortSignal,
+        abortSignal: firstEventAbort.signal,
         onStepFinish: (step: any) => {
           assistantContent = aiSdkStepToAssistantContent(step);
         },
@@ -402,8 +407,18 @@ class AISDKEngine implements AgentEngine {
       // Buffer the terminal stop so assistant-content can be emitted just
       // before it, regardless of where `finish` arrives in the stream.
       let bufferedStop: EngineEvent | undefined;
+      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;
@@ -413,6 +428,15 @@ class AISDKEngine implements AgentEngine {
         }
       }
 
+      // 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],
@@ -420,6 +444,7 @@ class AISDKEngine implements AgentEngine {
       });
       yield bufferedStop ?? { type: "stop", reason: "end_turn" };
     } catch (err: any) {
+      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.
@@ -427,12 +452,13 @@ class AISDKEngine implements AgentEngine {
         typeof err?.statusCode === "number" ? err.statusCode : undefined;
       const errorMessage = err?.message ?? String(err);
       const isConnectionError =
+        !timedOut &&
         statusCode === undefined &&
         String(errorMessage).trim().toLowerCase() === "connection error.";
       const providerRetryable: boolean | undefined =
         typeof err?.isRetryable === "boolean"
           ? err.isRetryable
-          : isConnectionError
+          : isConnectionError || timedOut
             ? true
             : undefined;
       if (statusCode === 401) {
@@ -455,12 +481,14 @@ class AISDKEngine implements AgentEngine {
         // 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();
     }
   }
 

package/corpus/core/src/agent/engine/anthropic-engine.ts

@@ -23,6 +23,10 @@ import {
   LLM_MISSING_CREDENTIALS_ERROR_CODE,
   LLM_MISSING_CREDENTIALS_MESSAGE,
 } from "./credential-errors.js";
+import {
+  createFirstEventAbortController,
+  FIRST_STREAM_EVENT_TIMEOUT_MS,
+} from "./first-event-timeout.js";
 import {
   clampThinkingBudgetTokens,
   resolveMaxOutputTokensForEngine,
@@ -186,8 +190,9 @@ class AnthropicEngine implements AgentEngine {
     // Remove undefined tools to avoid Anthropic API validation errors
     if (!requestParams.tools) delete requestParams.tools;
 
+    const firstEventAbort = createFirstEventAbortController(opts.abortSignal);
     const apiStream = client.messages.stream(requestParams, {
-      signal: opts.abortSignal,
+      signal: firstEventAbort.signal,
     });
 
     // Per-stream state lets the translator carry each tool-call's id/name from
@@ -198,6 +203,9 @@ class AnthropicEngine implements AgentEngine {
 
     try {
       for await (const chunk of apiStream) {
+        // The SDK's SSE parsing already drops `ping` keepalives before they
+        // reach this loop, so any chunk here is real provider progress.
+        firstEventAbort.markFirstEvent();
         const events = anthropicChunkToEngineEvents(chunk, chunkState);
         for (const event of events) {
           yield event;
@@ -238,17 +246,24 @@ class AnthropicEngine implements AgentEngine {
               : "end_turn",
       };
     } catch (err: any) {
+      const timedOut = firstEventAbort.didTimeout();
       const statusCode: number | undefined =
         typeof err?.status === "number"
           ? err.status
           : typeof err?.statusCode === "number"
             ? err.statusCode
             : undefined;
-      const errorMessage = err?.message ?? String(err);
+      // A first-event abort surfaces from the SDK as a generic
+      // APIUserAbortError ("Request was aborted.") — replace it with a
+      // message that actually explains what happened.
+      const errorMessage = timedOut
+        ? `Model request produced no stream events within ${FIRST_STREAM_EVENT_TIMEOUT_MS / 1000}s; the connection appears wedged.`
+        : (err?.message ?? String(err));
       // Anthropic SDK APIConnectionError defaults to "Connection error." with
       // no HTTP status. Tag it so in-run retries and run-level resume treat
       // the failure as a transient network interruption.
       const isConnectionError =
+        !timedOut &&
         statusCode === undefined &&
         String(errorMessage).trim().toLowerCase() === "connection error.";
       if (statusCode === 401) {
@@ -274,7 +289,7 @@ class AnthropicEngine implements AgentEngine {
         // continuation logic auto-resume a rate-limited turn.
         ...(statusCode !== undefined
           ? { errorCode: `http_${statusCode}`, statusCode }
-          : isConnectionError
+          : isConnectionError || timedOut
             ? {
                 errorCode: "provider_network_error",
                 providerRetryable: true,
@@ -282,6 +297,8 @@ class AnthropicEngine implements AgentEngine {
             : {}),
       };
       throw err;
+    } finally {
+      firstEventAbort.cleanup();
     }
   }
 }

package/corpus/core/src/agent/engine/builder-engine.ts

@@ -31,6 +31,7 @@ import {
   LLM_MISSING_CREDENTIALS_ERROR_CODE,
   LLM_MISSING_CREDENTIALS_MESSAGE,
 } from "./credential-errors.js";
+import { FIRST_STREAM_EVENT_TIMEOUT_MS } from "./first-event-timeout.js";
 import { resolveMaxOutputTokensForEngine } from "./output-tokens.js";
 import {
   engineMessagesToBuilderGatewayAnthropic,
@@ -272,12 +273,16 @@ class BuilderEngine implements AgentEngine {
             phase: "request",
             model: opts.model,
             gatewayUrl,
-            timeoutMs: gatewayTimeoutMs,
+            timeoutMs: gatewayAbort.effectiveTimeoutMs(),
             timedOut,
             elapsedMs: Date.now() - tStart,
           });
         }
-        yield createBuilderGatewayTimeoutStop(err, timedOut, gatewayTimeoutMs);
+        yield createBuilderGatewayTimeoutStop(
+          err,
+          timedOut,
+          gatewayAbort.effectiveTimeoutMs(),
+        );
         return;
       }
 
@@ -331,7 +336,8 @@ class BuilderEngine implements AgentEngine {
       yield* parseJsonlStream(reader, opts.model, {
         abortSignal: gatewayAbort.signal,
         didGatewayTimeout: gatewayAbort.didTimeout,
-        gatewayTimeoutMs,
+        getGatewayTimeoutMs: gatewayAbort.effectiveTimeoutMs,
+        onFirstEvent: gatewayAbort.markFirstEvent,
         gatewayUrl,
         requestStartedAt: tStart,
       });
@@ -475,13 +481,12 @@ async function* parseJsonlStream(
   captureContext: {
     abortSignal?: AbortSignal;
     didGatewayTimeout?: () => boolean;
-    gatewayTimeoutMs?: number;
+    getGatewayTimeoutMs?: () => number;
+    onFirstEvent?: () => void;
     gatewayUrl?: URL;
     requestStartedAt?: number;
   } = {},
 ): AsyncIterable<EngineEvent> {
-  const gatewayTimeoutMs =
-    captureContext.gatewayTimeoutMs ?? DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
   const parts: EngineContentPart[] = [];
   let pendingText = "";
   let pendingThinking: { text: string; signature?: string } | null = null;
@@ -533,6 +538,12 @@ async function* parseJsonlStream(
         return;
       }
 
+      // Heartbeats are transport-level keepalives, not proof the model is
+      // producing output — every other parsed event counts as first progress.
+      if (event?.type !== "heartbeat") {
+        captureContext.onFirstEvent?.();
+      }
+
       switch (event.type) {
         case "text-delta": {
           const text = event.text ?? "";
@@ -735,6 +746,9 @@ async function* parseJsonlStream(
     };
   } catch (err) {
     const timedOut = captureContext.didGatewayTimeout?.() ?? false;
+    const gatewayTimeoutMs =
+      captureContext.getGatewayTimeoutMs?.() ??
+      DEFAULT_BUILDER_GATEWAY_TIMEOUT_MS;
     if (timedOut || isBuilderGatewayNetworkError(err)) {
       captureBuilderGatewayTransportError(err, {
         phase: "stream",
@@ -880,16 +894,28 @@ function getBuilderGatewayTimeoutMs(): number {
   return Math.min(parsed, maxMs);
 }
 
+/**
+ * Two-stage abort deadline: until the first real stream event arrives, the
+ * effective deadline is min(totalTimeoutMs, FIRST_STREAM_EVENT_TIMEOUT_MS) —
+ * a wedged gateway that never streams anything gets cut off in ~2 minutes
+ * instead of riding the full flat timeout. Once `markFirstEvent()` fires, the
+ * timer reschedules for whatever remains of the original total deadline, so
+ * a request that starts streaming still gets the full budget it always did.
+ */
 function createGatewayAbortSignal(
   parentSignal: AbortSignal,
-  timeoutMs: number,
+  totalTimeoutMs: number,
 ): {
   signal: AbortSignal;
   didTimeout: () => boolean;
+  effectiveTimeoutMs: () => number;
+  markFirstEvent: () => void;
   cleanup: () => void;
 } {
   const controller = new AbortController();
   let timedOut = false;
+  let firstEventSeen = false;
+  const startedAt = Date.now();
 
   const abortFromParent = () => {
     if (!controller.signal.aborted) {
@@ -897,12 +923,18 @@ function createGatewayAbortSignal(
     }
   };
 
-  const timeout = setTimeout(() => {
+  const fireTimeout = () => {
     timedOut = true;
     if (!controller.signal.aborted) {
       controller.abort(new Error("Builder gateway request timed out"));
     }
-  }, timeoutMs);
+  };
+
+  const firstEventDeadlineMs = Math.min(
+    totalTimeoutMs,
+    FIRST_STREAM_EVENT_TIMEOUT_MS,
+  );
+  let timeout = setTimeout(fireTimeout, firstEventDeadlineMs);
 
   if (parentSignal.aborted) abortFromParent();
   parentSignal.addEventListener("abort", abortFromParent, { once: true });
@@ -910,6 +942,21 @@ function createGatewayAbortSignal(
   return {
     signal: controller.signal,
     didTimeout: () => timedOut,
+    effectiveTimeoutMs: () =>
+      firstEventSeen ? totalTimeoutMs : firstEventDeadlineMs,
+    markFirstEvent: () => {
+      if (firstEventSeen || timedOut) return;
+      firstEventSeen = true;
+      // The first-event window was already the binding constraint (total
+      // timeout <= it) — nothing to reschedule.
+      if (firstEventDeadlineMs >= totalTimeoutMs) return;
+      clearTimeout(timeout);
+      const remainingMs = Math.max(
+        0,
+        totalTimeoutMs - (Date.now() - startedAt),
+      );
+      timeout = setTimeout(fireTimeout, remainingMs);
+    },
     cleanup: () => {
       clearTimeout(timeout);
       parentSignal.removeEventListener("abort", abortFromParent);

package/corpus/core/src/agent/engine/first-event-timeout.ts

@@ -0,0 +1,64 @@
+/**
+ * Shared "first stream event" deadline for model-request engines.
+ *
+ * A request that connects successfully but then streams zero events means the
+ * transport or gateway is wedged, not slow — real models (including deep
+ * thinking ones) emit their first event within seconds. Bounding this window
+ * separately from any total-request deadline turns a silent multi-minute hang
+ * into a fast abort-and-retry.
+ */
+export const FIRST_STREAM_EVENT_TIMEOUT_MS = 120_000;
+
+export interface FirstEventAbortController {
+  readonly signal: AbortSignal;
+  /** Idempotent. Call once the first real (non-keepalive) stream event arrives. */
+  markFirstEvent: () => void;
+  didTimeout: () => boolean;
+  cleanup: () => void;
+}
+
+/**
+ * Layer a first-event deadline on top of a caller's AbortSignal. Aborts if
+ * `markFirstEvent()` is not called within `FIRST_STREAM_EVENT_TIMEOUT_MS`.
+ * Has no opinion on a total-request deadline — callers that need one (e.g.
+ * builder-engine's flat gateway timeout) compose their own on top.
+ */
+export function createFirstEventAbortController(
+  parentSignal: AbortSignal,
+): FirstEventAbortController {
+  const controller = new AbortController();
+  let timedOut = false;
+  let firstEventSeen = false;
+
+  const abortFromParent = () => {
+    if (!controller.signal.aborted) controller.abort(parentSignal.reason);
+  };
+
+  const timeout = setTimeout(() => {
+    timedOut = true;
+    if (!controller.signal.aborted) {
+      controller.abort(
+        new Error(
+          `Model request produced no stream events within ${FIRST_STREAM_EVENT_TIMEOUT_MS / 1000}s`,
+        ),
+      );
+    }
+  }, FIRST_STREAM_EVENT_TIMEOUT_MS);
+
+  if (parentSignal.aborted) abortFromParent();
+  parentSignal.addEventListener("abort", abortFromParent, { once: true });
+
+  return {
+    signal: controller.signal,
+    markFirstEvent: () => {
+      if (firstEventSeen) return;
+      firstEventSeen = true;
+      clearTimeout(timeout);
+    },
+    didTimeout: () => timedOut,
+    cleanup: () => {
+      clearTimeout(timeout);
+      parentSignal.removeEventListener("abort", abortFromParent);
+    },
+  };
+}

package/corpus/core/src/client/AssistantChat.tsx

@@ -3237,7 +3237,9 @@ const AssistantChatInner = forwardRef<
           const reconnectErrorCode =
             reconnectTerminalReason === "run_timeout"
               ? "run_timeout"
-              : "reconnect_no_progress";
+              : reconnectTerminalReason === "stream_ended"
+                ? "reconnect_stream_ended"
+                : "reconnect_no_progress";
           captureError(new Error(`agent-chat:${reconnectErrorCode}`), {
             tags: {
               context: "agent-native-chat",
@@ -3309,9 +3311,11 @@ const AssistantChatInner = forwardRef<
           }
           setRunErrorInfo({
             message:
-              reconnectTerminalReason === "run_timeout"
+              reconnectErrorCode === "run_timeout"
                 ? "The previous background agent run reached its time limit before finishing. The partial work was preserved; continue or retry to pick up from here."
-                : "The previous agent run stopped producing visible progress during recovery, so it was stopped before it could keep looping.",
+                : reconnectErrorCode === "reconnect_stream_ended"
+                  ? "The previous agent stream ended while the run was recovering. Continue or retry to reconnect to the run."
+                  : "The previous agent run stopped producing visible progress during recovery, so it was stopped before it could keep looping.",
             errorCode: reconnectErrorCode,
             recoverable: true,
             runId,

package/corpus/core/src/client/resources/ResourcesPanel.tsx

@@ -613,7 +613,7 @@ The result should be a reusable agent profile, not a one-off task response.`,
       icon: <IconBulb className="h-3.5 w-3.5" />,
       label: "Create Skill",
       desc: "Teach the agent a new ability",
-      action: openSkillFlyout,
+      action: () => openSkillFlyout(),
       hoverAction: openSkillFlyout,
     },
     {

package/corpus/core/src/integrations/computer-supervision-store.ts

@@ -175,7 +175,7 @@ export async function decideComputerApproval(input: {
           SET status = ?, decision_result_json = ?, decided_by = ?,
               decided_at = ?, updated_at = ?
           WHERE id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND action_hash = ? AND status = 'pending' AND expires_at > ?`,
     args: [
       input.decision,
@@ -204,7 +204,7 @@ export async function getComputerApprovalForOwner(input: {
   const { rows } = await getDbExec().execute({
     sql: `SELECT * FROM integration_computer_approvals
           WHERE id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
           LIMIT 1`,
     args: [
       input.id,
@@ -228,7 +228,7 @@ export async function listComputerApprovalsForOwner(input: {
   await ensureComputerApprovalStore();
   const clauses = [
     "owner_email = ?",
-    "((org_id IS NULL AND ? IS NULL) OR org_id = ?)",
+    "((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)",
   ];
   const args: Array<string | number | null> = [
     input.ownerEmail,
@@ -295,7 +295,7 @@ export async function authorizeComputerOperation(
   const { rows } = await client.execute({
     sql: `SELECT * FROM integration_computer_approvals
           WHERE id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND device_id = ? AND task_id = ? AND run_id = ?
           LIMIT 1`,
     args: [

package/corpus/core/src/integrations/pending-tasks-store.ts

@@ -316,7 +316,7 @@ export async function resolveIntegrationSourceContext(
           FROM integration_pending_tasks
           WHERE id = ?
             AND owner_email = ?
-            AND (org_id = ? OR (org_id IS NULL AND ? IS NULL))
+            AND (org_id = ? OR (org_id IS NULL AND CAST(? AS TEXT) IS NULL))
             AND platform = 'slack'
           LIMIT 1`,
     args: [id, ownerEmail, orgId, orgId],

package/corpus/core/src/integrations/remote-commands-store.ts

@@ -368,7 +368,7 @@ export async function listRemoteCommandsForOwner(input: {
   const { rows } = await getDbExec().execute({
     sql: `SELECT * FROM integration_remote_commands
           WHERE owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
           ORDER BY updated_at DESC
           LIMIT ?`,
     args: [input.ownerEmail, input.orgId ?? null, input.orgId ?? null, limit],
@@ -435,7 +435,7 @@ export async function claimNextComputerCommand(input: {
   const { rows } = await client.execute({
     sql: `SELECT * FROM integration_remote_commands
           WHERE device_id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND kind = 'computer-operation' AND status = 'pending'
             AND next_check_at <= ?${operationClassClause}
           ORDER BY computer_sequence ASC, created_at ASC
@@ -477,7 +477,7 @@ export async function claimNextComputerCommand(input: {
       sql: `UPDATE integration_remote_commands
             SET status = 'failed', error_message = ?, completed_at = ?, updated_at = ?
             WHERE id = ? AND device_id = ? AND owner_email = ?
-              AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+              AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
               AND status = 'pending'`,
       args: [
         error instanceof Error
@@ -500,13 +500,13 @@ export async function claimNextComputerCommand(input: {
       ? `UPDATE integration_remote_commands
           SET status = 'claimed', attempts = attempts + 1, claimed_at = ?, updated_at = ?
           WHERE id = ? AND device_id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND status = 'pending' AND lease_expires_at > ?
           RETURNING *`
       : `UPDATE integration_remote_commands
           SET status = 'claimed', attempts = attempts + 1, claimed_at = ?, updated_at = ?
           WHERE id = ? AND device_id = ? AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND status = 'pending' AND lease_expires_at > ?`,
     args: [
       now,

package/corpus/core/src/integrations/remote-devices-store.ts

@@ -243,7 +243,7 @@ export async function getRemoteDeviceForOwner(input: {
     sql: `SELECT * FROM integration_remote_devices
           WHERE id = ?
             AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
           LIMIT 1`,
     args: [
       input.id,
@@ -287,7 +287,7 @@ export async function listRemoteDevicesForOwner(input: {
   const { rows } = await getDbExec().execute({
     sql: `SELECT * FROM integration_remote_devices
           WHERE owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)${statusClause}
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)${statusClause}
           ORDER BY COALESCE(last_seen_at, updated_at) DESC
           LIMIT ?`,
     args,
@@ -379,7 +379,7 @@ export async function revokeRemoteDeviceForOwner(input: {
               updated_at = ?
           WHERE id = ?
             AND owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)`,
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)`,
     args: [
       now,
       now,

package/corpus/core/src/integrations/remote-push-store.ts

@@ -330,7 +330,7 @@ export async function listRemotePushRegistrationsForOwner(input: {
   const { rows } = await getDbExec().execute({
     sql: `SELECT * FROM integration_remote_push_registrations
           WHERE owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)${statusClause}
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)${statusClause}
           ORDER BY COALESCE(last_seen_at, updated_at) DESC
           LIMIT ?`,
     args: [input.ownerEmail, input.orgId ?? null, input.orgId ?? null, limit],
@@ -352,7 +352,7 @@ export async function unregisterRemotePushRegistrationForOwner(input: {
     sql: `UPDATE integration_remote_push_registrations
           SET status = 'inactive', updated_at = ?
           WHERE owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
             AND (${input.id ? "id = ?" : "0 = 1"} OR ${
               tokenHash ? "token_hash = ?" : "0 = 1"
             })`,
@@ -432,7 +432,7 @@ export async function listRemotePushNotificationsForOwner(input: {
   const { rows } = await getDbExec().execute({
     sql: `SELECT * FROM integration_remote_push_notifications
           WHERE owner_email = ?
-            AND ((org_id IS NULL AND ? IS NULL) OR org_id = ?)${statusClause}
+            AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)${statusClause}
           ORDER BY created_at DESC
           LIMIT ?`,
     args,