@agent-native/core 0.195.0 → 0.195.1-nightly-20260927210321

package/corpus/templates/mail/app/components/layout/SearchBar.tsx

@@ -22,6 +22,11 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
+import {
+  Popover,
+  PopoverAnchor,
+  PopoverContent,
+} from "@/components/ui/popover";
 import {
   Tooltip,
   TooltipContent,
@@ -294,192 +299,204 @@ export function SearchBar({
 
   return (
     <div className="relative flex items-center gap-1.5">
-      <div
-        className={cn(
-          "relative flex items-center rounded bg-accent/80 focus-within:ring-1 focus-within:ring-primary/40",
-          hasActiveSearch ? "w-56 sm:w-64" : "w-40 sm:w-48",
-        )}
-      >
-        <input
-          ref={inputRef}
-          id="mail-search"
-          data-mail-search
-          role="combobox"
-          aria-label={t("mail.search.label")}
-          aria-autocomplete="list"
-          aria-controls={showDropdown ? "mail-search-suggestions" : undefined}
-          aria-expanded={showDropdown}
-          aria-activedescendant={getActiveDescendantId(
-            "mail-search-suggestion-",
-            showDropdown,
-            selectedIndex,
-            combinedMatchCount,
-          )}
-          autoFocus={autoFocus}
-          value={query}
-          onChange={(e) => setQuery(e.target.value)}
-          onKeyDown={handleKeyDown}
-          onFocus={() => {
-            if (blurCloseTimeoutRef.current !== null) {
-              clearTimeout(blurCloseTimeoutRef.current);
-              blurCloseTimeoutRef.current = null;
-            }
-            setIsFocused(true);
-          }}
-          onBlur={(e) => {
-            if (
-              e.relatedTarget &&
-              (e.relatedTarget as HTMLElement).closest("[data-search-dropdown]")
-            ) {
-              return;
-            }
-            setIsFocused(false);
-            if (hasActiveSearch || query.trim()) return;
-            blurCloseTimeoutRef.current = setTimeout(() => {
-              blurCloseTimeoutRef.current = null;
-              onClose();
-            }, 100);
-          }}
-          placeholder={t("mail.search.placeholder")}
-          className={cn(
-            "h-8 sm:h-7 flex-1 min-w-0 bg-transparent border-none px-2.5 text-[13px] text-foreground placeholder:text-muted-foreground/60 outline-none",
-            hasActiveSearch && "font-medium",
-          )}
-        />
-        {hasActiveSearch && onSaveSearch && (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                aria-label={t("mail.search.saveAsTab")}
-                onMouseDown={(e) => e.preventDefault()}
-                onClick={handleSaveSearch}
-                className="flex h-5 w-5 me-1 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent"
-              >
-                <IconPin className="h-3.5 w-3.5" />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent>{t("mail.search.saveAsTab")}</TooltipContent>
-          </Tooltip>
-        )}
-        {(hasActiveSearch || query) && (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                aria-label={t("mail.search.clear")}
-                onMouseDown={(e) => {
-                  e.preventDefault();
-                  handleClear();
-                }}
-                onClick={(e) => {
-                  if (e.detail === 0) handleClear();
-                }}
-                className="flex h-5 w-5 me-1 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent"
-              >
-                <IconX className="h-3.5 w-3.5" />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent>{t("mail.search.clear")}</TooltipContent>
-          </Tooltip>
-        )}
-      </div>
-
-      {/* Contact + instant local-match suggestions dropdown */}
-      {showDropdown && (
-        <div
-          data-search-dropdown
-          id="mail-search-suggestions"
-          role="listbox"
-          ref={listRef}
-          className="absolute end-0 top-full mt-1 w-72 rounded-lg border border-border bg-popover shadow-lg z-50 py-1 overflow-hidden"
-        >
-          {matchedContacts.map((contact, i) => (
-            <button
-              key={contact.email}
-              data-contact-item
-              data-search-item
-              id={`mail-search-suggestion-${i}`}
-              role="option"
-              aria-selected={i === selectedIndex}
-              type="button"
-              tabIndex={-1}
-              onMouseDown={(e) => {
-                e.preventDefault();
-                selectContact(contact);
-              }}
-              onMouseEnter={() => setSelectedIndex(i)}
-              className={cn(
-                "flex w-full items-center gap-3 px-3 py-2 text-start text-[13px]",
-                i === selectedIndex && "bg-accent",
-              )}
-            >
-              <span className="min-w-0 flex-1 truncate text-foreground/90">
-                {highlight(contact.name || contact.email, query.trim())}
-              </span>
-              {contact.name && (
-                <span className="shrink-0 text-muted-foreground text-xs">
-                  {highlight(contact.email, query.trim())}
-                </span>
+      <Popover open={showDropdown}>
+        <PopoverAnchor asChild>
+          <div
+            className={cn(
+              "relative flex items-center rounded bg-accent/80 focus-within:ring-1 focus-within:ring-primary/40",
+              hasActiveSearch ? "w-56 sm:w-64" : "w-40 sm:w-48",
+            )}
+          >
+            <input
+              ref={inputRef}
+              id="mail-search"
+              data-mail-search
+              role="combobox"
+              aria-label={t("mail.search.label")}
+              aria-autocomplete="list"
+              aria-controls={
+                showDropdown ? "mail-search-suggestions" : undefined
+              }
+              aria-expanded={showDropdown}
+              aria-activedescendant={getActiveDescendantId(
+                "mail-search-suggestion-",
+                showDropdown,
+                selectedIndex,
+                combinedMatchCount,
               )}
-            </button>
-          ))}
-
-          {showLocalResults && localMatches.length > 0 && (
-            <div
+              autoFocus={autoFocus}
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              onKeyDown={handleKeyDown}
+              onFocus={() => {
+                if (blurCloseTimeoutRef.current !== null) {
+                  clearTimeout(blurCloseTimeoutRef.current);
+                  blurCloseTimeoutRef.current = null;
+                }
+                setIsFocused(true);
+              }}
+              onBlur={(e) => {
+                if (
+                  e.relatedTarget &&
+                  (e.relatedTarget as HTMLElement).closest(
+                    "[data-search-dropdown]",
+                  )
+                ) {
+                  return;
+                }
+                setIsFocused(false);
+                if (hasActiveSearch || query.trim()) return;
+                blurCloseTimeoutRef.current = setTimeout(() => {
+                  blurCloseTimeoutRef.current = null;
+                  onClose();
+                }, 100);
+              }}
+              placeholder={t("mail.search.placeholder")}
               className={cn(
-                "border-border/60",
-                matchedContacts.length > 0 && "border-t",
+                "h-8 sm:h-7 flex-1 min-w-0 bg-transparent border-none px-2.5 text-[13px] text-foreground placeholder:text-muted-foreground/60 outline-none",
+                hasActiveSearch && "font-medium",
               )}
-            >
-              <div className="px-3 pt-2 pb-1 text-[11px] font-medium uppercase tracking-wide text-muted-foreground/70">
-                {t("mail.search.localResults")}
-              </div>
-              {localMatches.map((thread, i) => {
-                const combinedIndex = matchedContacts.length + i;
-                const email = thread.latestMessage;
-                return (
+            />
+            {hasActiveSearch && onSaveSearch && (
+              <Tooltip>
+                <TooltipTrigger asChild>
                   <button
-                    key={email.threadId || email.id}
-                    data-search-item
-                    id={`mail-search-suggestion-${combinedIndex}`}
-                    role="option"
-                    aria-selected={combinedIndex === selectedIndex}
                     type="button"
-                    tabIndex={-1}
+                    aria-label={t("mail.search.saveAsTab")}
+                    onMouseDown={(e) => e.preventDefault()}
+                    onClick={handleSaveSearch}
+                    className="flex h-5 w-5 me-1 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent"
+                  >
+                    <IconPin className="h-3.5 w-3.5" />
+                  </button>
+                </TooltipTrigger>
+                <TooltipContent>{t("mail.search.saveAsTab")}</TooltipContent>
+              </Tooltip>
+            )}
+            {(hasActiveSearch || query) && (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <button
+                    type="button"
+                    aria-label={t("mail.search.clear")}
                     onMouseDown={(e) => {
                       e.preventDefault();
-                      selectThread(thread);
+                      handleClear();
+                    }}
+                    onClick={(e) => {
+                      if (e.detail === 0) handleClear();
                     }}
-                    onMouseEnter={() => setSelectedIndex(combinedIndex)}
-                    className={cn(
-                      "flex w-full items-center gap-2 px-3 py-2 text-start text-[13px]",
-                      combinedIndex === selectedIndex && "bg-accent",
-                    )}
+                    className="flex h-5 w-5 me-1 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-accent"
                   >
-                    <span className="min-w-0 flex-1 truncate text-foreground/90">
-                      {highlight(
-                        email.subject || email.from.name,
-                        query.trim(),
-                      )}
-                    </span>
-                    <span className="shrink-0 truncate max-w-[35%] text-muted-foreground text-xs">
-                      {email.from.name || email.from.email}
-                    </span>
+                    <IconX className="h-3.5 w-3.5" />
                   </button>
-                );
-              })}
-            </div>
-          )}
+                </TooltipTrigger>
+                <TooltipContent>{t("mail.search.clear")}</TooltipContent>
+              </Tooltip>
+            )}
+          </div>
+        </PopoverAnchor>
 
-          {showLocalResults && remoteSearchPending && (
-            <div className="flex items-center gap-2 border-t border-border/60 px-3 py-2 text-[12px] text-muted-foreground">
-              <IconLoader2 className="h-3 w-3 animate-spin" />
-              {t("mail.search.searchingGmail")}
-            </div>
-          )}
-        </div>
-      )}
+        {/* Contact + instant local-match suggestions dropdown */}
+        {showDropdown && (
+          <PopoverContent
+            align="end"
+            data-search-dropdown
+            id="mail-search-suggestions"
+            role="listbox"
+            ref={listRef}
+            side="bottom"
+            sideOffset={4}
+            onOpenAutoFocus={(event) => event.preventDefault()}
+            className="w-72 max-w-[calc(100vw-1rem)] overflow-hidden rounded-lg p-0"
+          >
+            {matchedContacts.map((contact, i) => (
+              <button
+                key={contact.email}
+                data-contact-item
+                data-search-item
+                id={`mail-search-suggestion-${i}`}
+                role="option"
+                aria-selected={i === selectedIndex}
+                type="button"
+                tabIndex={-1}
+                onMouseDown={(e) => {
+                  e.preventDefault();
+                  selectContact(contact);
+                }}
+                onMouseEnter={() => setSelectedIndex(i)}
+                className={cn(
+                  "flex w-full items-center gap-3 px-3 py-2 text-start text-[13px]",
+                  i === selectedIndex && "bg-accent",
+                )}
+              >
+                <span className="min-w-0 flex-1 truncate text-foreground/90">
+                  {highlight(contact.name || contact.email, query.trim())}
+                </span>
+                {contact.name && (
+                  <span className="shrink-0 text-muted-foreground text-xs">
+                    {highlight(contact.email, query.trim())}
+                  </span>
+                )}
+              </button>
+            ))}
+
+            {showLocalResults && localMatches.length > 0 && (
+              <div
+                className={cn(
+                  "border-border/60",
+                  matchedContacts.length > 0 && "border-t",
+                )}
+              >
+                <div className="px-3 pt-2 pb-1 text-[11px] font-medium uppercase tracking-wide text-muted-foreground/70">
+                  {t("mail.search.localResults")}
+                </div>
+                {localMatches.map((thread, i) => {
+                  const combinedIndex = matchedContacts.length + i;
+                  const email = thread.latestMessage;
+                  return (
+                    <button
+                      key={email.threadId || email.id}
+                      data-search-item
+                      id={`mail-search-suggestion-${combinedIndex}`}
+                      role="option"
+                      aria-selected={combinedIndex === selectedIndex}
+                      type="button"
+                      tabIndex={-1}
+                      onMouseDown={(e) => {
+                        e.preventDefault();
+                        selectThread(thread);
+                      }}
+                      onMouseEnter={() => setSelectedIndex(combinedIndex)}
+                      className={cn(
+                        "flex w-full items-center gap-2 px-3 py-2 text-start text-[13px]",
+                        combinedIndex === selectedIndex && "bg-accent",
+                      )}
+                    >
+                      <span className="min-w-0 flex-1 truncate text-foreground/90">
+                        {highlight(
+                          email.subject || email.from.name,
+                          query.trim(),
+                        )}
+                      </span>
+                      <span className="shrink-0 truncate max-w-[35%] text-muted-foreground text-xs">
+                        {email.from.name || email.from.email}
+                      </span>
+                    </button>
+                  );
+                })}
+              </div>
+            )}
+
+            {showLocalResults && remoteSearchPending && (
+              <div className="flex items-center gap-2 border-t border-border/60 px-3 py-2 text-[12px] text-muted-foreground">
+                <IconLoader2 className="h-3 w-3 animate-spin" />
+                {t("mail.search.searchingGmail")}
+              </div>
+            )}
+          </PopoverContent>
+        )}
+      </Popover>
 
       <Dialog
         open={saveDialogOpen}

package/corpus/templates/mail/app/components/onboarding/AiInboxSetup.tsx

@@ -1,6 +1,7 @@
 import { sendToAgentChat } from "@agent-native/core/client/agent-chat";
 import { useActionQuery } from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
+import { useFirstRunOnboardingGateOwnsSurface } from "@agent-native/core/client/onboarding";
 import { AI_FILTER_LABEL } from "@shared/ai-filter";
 import type { AiFilterBackfillStatus } from "@shared/ai-filter-backfill";
 import {
@@ -402,6 +403,7 @@ export function AiInboxSetup({
   onSkipSetup?: () => void;
 }) {
   const t = useT();
+  const firstRunOnboardingOwnsSurface = useFirstRunOnboardingGateOwnsSurface();
   const { data: settings } = useSettings();
   const { data: rules = [], isLoading: rulesLoading } = useAutomations();
   const googleStatus = useGoogleAuthStatus();
@@ -467,6 +469,7 @@ export function AiInboxSetup({
     [rules],
   );
   const visible =
+    !firstRunOnboardingOwnsSurface &&
     connected &&
     !googleStatus.isLoading &&
     !jevAvailability.isLoading &&
@@ -960,6 +963,7 @@ export function AiInboxSetup({
                 step < 3 &&
                 (saving ||
                   customTagIncomplete ||
+                  (step === 1 && !importantPrompt.trim()) ||
                   (step === 2 && (!jevConfigured || rulesLoading)))
               }
               aria-busy={saving || (step === 2 && rulesLoading)}

package/corpus/templates/mail/app/global.css

@@ -56,6 +56,8 @@
   --mail-label-finance-text: 163 94% 24%;
   --mail-label-travel-bg: 187 85% 53% / 0.2;
   --mail-label-travel-text: 192 91% 36%;
+  --mail-importance-low: oklch(56% 0.17 25);
+  --mail-importance-high: oklch(50% 0.15 145);
 }
 
 .dark {
@@ -101,6 +103,8 @@
   --mail-label-forums-text: 199 95% 74%;
   --mail-label-finance-text: 152 76% 70%;
   --mail-label-travel-text: 188 86% 74%;
+  --mail-importance-low: oklch(78% 0.13 25);
+  --mail-importance-high: oklch(78% 0.13 145);
 }
 
 @layer base {
@@ -260,6 +264,16 @@
   z-index: 3;
   flex: none;
 }
+.email-importance-score {
+  position: relative;
+  z-index: 3;
+  color: hsl(var(--foreground));
+  color: color-mix(
+    in oklch,
+    var(--mail-importance-low) calc(100% - var(--mail-importance-weight)),
+    var(--mail-importance-high) var(--mail-importance-weight)
+  );
+}
 .email-list-row.focused .hover-actions,
 .email-list-row:hover .hover-actions {
   opacity: 1;

package/corpus/templates/mail/changelog/2026-09-27-inbox-priority-shows-each-email-s-score-with-quick-feedback-.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-09-27
+---
+
+Inbox Priority shows each email's score with quick feedback and rule settings.

package/corpus/templates/mail/changelog/2026-09-27-mail-setup-waits-for-first-run-onboarding-and-empty-importan.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-27
+---
+
+Mail setup waits for first-run onboarding, and empty importance prompts require an explicit skip.

package/corpus/templates/mail/changelog/2026-09-27-mobile-inbox-toolbar-scrolls-together.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-27
+---
+
+Inbox tabs are visible on mobile, and the full toolbar scrolls together horizontally.

package/corpus/templates/slides/actions/generate-home-suggestions.ts

@@ -49,26 +49,70 @@ function roleContext(value: string | null | undefined): string {
   return `The user's selected onboarding role is ${JSON.stringify(role)}. Tailor suggestions to that role's typical work and goals.`;
 }
 
+function findArrayEnd(text: string, start: number): number | undefined {
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+
+  for (let index = start; index < text.length; index++) {
+    const char = text[index];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (char === "\\") escaped = true;
+      else if (char === '"') inString = false;
+      continue;
+    }
+    if (char === '"') inString = true;
+    else if (char === "[") depth++;
+    else if (char === "]" && --depth === 0) return index;
+  }
+}
+
 function parseSuggestions(text: string) {
   const unwrapped = text
     .trim()
     .replace(/^```(?:json)?\s*/i, "")
     .replace(/\s*```$/i, "");
-  const start = unwrapped.indexOf("[");
-  const end = unwrapped.lastIndexOf("]");
-  const json =
-    start >= 0 && end > start ? unwrapped.slice(start, end + 1) : unwrapped;
-  let parsed: unknown;
+  let parsedJson: unknown;
+  let hasTopLevelJson = false;
   try {
-    parsed = JSON.parse(json);
-  } catch {
-    throw new Error("Home suggestions returned invalid JSON.");
+    parsedJson = JSON.parse(unwrapped);
+    hasTopLevelJson = true;
+  } catch (error) {
+    if (!(error instanceof SyntaxError)) throw error;
+  }
+  if (hasTopLevelJson) {
+    const result = suggestionsSchema.safeParse(parsedJson);
+    if (!result.success) {
+      throw new Error("Home suggestions returned an invalid shape.");
+    }
+    return result.data;
+  }
+
+  let parsedCandidateJson = false;
+  for (
+    let start = unwrapped.indexOf("[");
+    start >= 0;
+    start = unwrapped.indexOf("[", start + 1)
+  ) {
+    const end = findArrayEnd(unwrapped, start);
+    if (end === undefined) continue;
+
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(unwrapped.slice(start, end + 1));
+    } catch (error) {
+      if (!(error instanceof SyntaxError)) throw error;
+      continue;
+    }
+    parsedCandidateJson = true;
+    const result = suggestionsSchema.safeParse(parsed);
+    if (result.success) return result.data;
   }
-  const result = suggestionsSchema.safeParse(parsed);
-  if (!result.success) {
+  if (parsedCandidateJson) {
     throw new Error("Home suggestions returned an invalid shape.");
   }
-  return result.data;
+  throw new Error("Home suggestions returned invalid JSON.");
 }
 
 export default defineAction({

package/corpus/templates/slides/changelog/2026-09-27-personalized-presentation-suggestions-work-when-responses-in.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-09-27
+---
+
+Personalized presentation suggestions work when responses include extra text

package/dist/client/onboarding/first-run-startup-gate.js

@@ -71,12 +71,13 @@ export function FirstRunOnboardingStartupGate({ children, fallback = _jsx(AppShe
         };
     }, [shouldResolve]);
     const ownsSurface = decision === "eligible";
-    const hideApp = decision !== "ineligible";
+    const gateOwnsSurface = decision !== "ineligible";
+    const hideApp = gateOwnsSurface;
     const app = shouldResolve ? (_jsx("div", { "aria-hidden": hideApp ? "true" : undefined, "data-first-run-app-hidden": hideApp ? "true" : undefined, style: {
             display: "contents",
             ...(hideApp ? { visibility: "hidden" } : {}),
         }, children: children })) : (children);
-    return (_jsxs(FirstRunOnboardingGateContext.Provider, { value: ownsSurface, children: [app, decision === "pending" && (_jsx(FirstRunOnboardingStartupLoading, { fallback: fallback })), ownsSurface && (_jsx(Suspense, { fallback: _jsx(FirstRunOnboardingStartupLoading, { fallback: fallback }), children: _jsx(FirstRunOnboarding, { initialFirstRun: true }) }))] }));
+    return (_jsxs(FirstRunOnboardingGateContext.Provider, { value: gateOwnsSurface, children: [app, decision === "pending" && (_jsx(FirstRunOnboardingStartupLoading, { fallback: fallback })), ownsSurface && (_jsx(Suspense, { fallback: _jsx(FirstRunOnboardingStartupLoading, { fallback: fallback }), children: _jsx(FirstRunOnboarding, { initialFirstRun: true }) }))] }));
 }
 function FirstRunOnboardingStartupLoading({ fallback, }) {
     return (_jsx("div", { role: "status", "aria-label": "Loading application", "data-first-run-startup-loading": "true", className: "fixed inset-0 z-[110] bg-background", children: _jsx("div", { inert: true, children: fallback }) }));

package/dist/collab/routes.d.ts

@@ -16,8 +16,8 @@ export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import
 }>>;
 export declare const postCollabText: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     ok?: undefined;
-    text?: undefined;
     error: string;
+    text?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/observability/routes.d.ts

@@ -20,27 +20,27 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
+    error?: undefined;
+    ok?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
     id?: undefined;
+} | {
     error?: undefined;
     ok?: undefined;
-} | {
     summary?: undefined;
     spans?: undefined;
     id: string;
-    error?: undefined;
-    ok?: undefined;
 } | {
+    ok?: undefined;
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
     error: any;
-    ok?: undefined;
 } | {
+    error?: undefined;
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
-    error?: undefined;
     ok: boolean;
 }>>;

package/dist/org/auth-policy.js

@@ -1,7 +1,6 @@
 import { getCurrentAdapter } from "better-auth";
 import { getAppConfig } from "../app-config/index.js";
 import { getDbExec } from "../db/client.js";
-import { invalidateSessionEmailCache } from "../server/session-email-cache.js";
 export const GOOGLE_AUTH_REQUIRED_MESSAGE = "This organization requires Google sign-in.";
 export const SSO_AUTH_REQUIRED_MESSAGE = "This organization requires single sign-on.";
 export function authProviderRequiredMessage(provider) {
@@ -184,7 +183,6 @@ export async function setRequiredAuthProvider(orgId, provider) {
         if (!isMissingLegacySessionTable(error))
             throw error;
     }
-    invalidateSessionEmailCache();
     return {
         revokedBetterAuthSessions: Number(betterAuthResult.rowsAffected ?? 0),
         revokedLegacySessions: Number(legacyResult.rowsAffected ?? 0),

package/dist/progress/routes.d.ts

@@ -2,6 +2,6 @@ export declare function createProgressHandler(): import("h3").EventHandlerWithFe
     error: string;
     ok?: undefined;
 } | {
-    ok: boolean;
     error?: undefined;
+    ok: boolean;
 }>>;