@agent-native/core 0.68.0 → 0.68.2

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

@@ -50,7 +50,12 @@ import type {
   ChatThreadSnapshot,
 } from "./use-chat-threads.js";
 import { useAgentEngineConfigured } from "./use-agent-engine-configured.js";
-import { getActiveRun } from "./active-run-state.js";
+import {
+  getActiveRun,
+  resolveReconnectAfterSeq,
+  setActiveRun,
+  updateActiveRunSeq,
+} from "./active-run-state.js";
 import {
   AgentAutoContinueSignal,
   type ContentPart,
@@ -1247,6 +1252,7 @@ const AssistantChatInner = forwardRef<
   // When stop is clicked during reconnect, keep content visible (don't wipe it)
   const [reconnectFrozen, setReconnectFrozen] = useState(false);
   const reconnectRunIdRef = useRef<string | null>(null);
+  const [reconnectAfterSeq, setReconnectAfterSeq] = useState(0);
   const reconnectAbortRef = useRef<AbortController | null>(null);
   // Nuclear stop: user clicked stop. Clears the stop button/indicator AND
   // lets new submissions go through immediately — prevents the "stuck
@@ -1456,6 +1462,13 @@ const AssistantChatInner = forwardRef<
       if (reconnectRunIdRef.current === runId) return true;
 
       reconnectRunIdRef.current = runId;
+      const afterSeq = resolveReconnectAfterSeq(threadId, runId);
+      setReconnectAfterSeq(afterSeq);
+      setActiveRun({
+        threadId,
+        runId,
+        lastSeq: afterSeq > 0 ? afterSeq - 1 : -1,
+      });
       setIsReconnecting(true);
       setReconnectFrozen(false);
       setReconnectContent([]);
@@ -1498,9 +1511,16 @@ const AssistantChatInner = forwardRef<
       const streamReconnect = async () => {
         let noProgressDuringReconnect = false;
         let latestContent: ContentPart[] = [];
+        const threadPollInterval =
+          afterSeq > 0
+            ? window.setInterval(() => {
+                if (reconnectRunIdRef.current !== runId) return;
+                void refreshThreadFromServer();
+              }, 2000)
+            : undefined;
         try {
           const sseRes = await fetch(
-            `${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=0`,
+            `${apiUrl}/runs/${encodeURIComponent(runId)}/events?after=${afterSeq}`,
             { signal: abortCtrl.signal },
           );
           if (sseRes.ok && sseRes.body) {
@@ -1511,6 +1531,7 @@ const AssistantChatInner = forwardRef<
             let rafPending = false;
             let latestSnapshot: ContentPart[] = [];
             const scheduleUpdate = (snapshot: ContentPart[]) => {
+              if (afterSeq > 0) return;
               latestSnapshot = snapshot;
               if (rafPending) return;
               rafPending = true;
@@ -1526,8 +1547,11 @@ const AssistantChatInner = forwardRef<
               toolCallCounter,
               tabId,
               scheduleUpdate,
+              (seq) => updateActiveRunSeq(seq),
             );
-            setReconnectContent([...content]);
+            if (afterSeq === 0) {
+              setReconnectContent([...content]);
+            }
           }
         } catch (err) {
           if (
@@ -1543,6 +1567,9 @@ const AssistantChatInner = forwardRef<
             noProgressDuringReconnect = true;
           }
         } finally {
+          if (threadPollInterval !== undefined) {
+            window.clearInterval(threadPollInterval);
+          }
           clearInterval(watchdog);
           clearTimeout(maxReconnectTimer);
         }
@@ -1570,9 +1597,17 @@ const AssistantChatInner = forwardRef<
           } catch {
             // Best effort — the important part is unwinding the UI.
           }
-          settleInterruptedToolCalls(latestContent);
-          setReconnectContent([...latestContent]);
-          setReconnectFrozen(latestContent.length > 0);
+          if (afterSeq > 0) {
+            // Tail-resume only replays new events; never freeze that slice as a
+            // complete assistant turn — the server thread is authoritative.
+            await refreshThreadFromServer();
+            setReconnectContent([]);
+            setReconnectFrozen(false);
+          } else {
+            settleInterruptedToolCalls(latestContent);
+            setReconnectContent([...latestContent]);
+            setReconnectFrozen(latestContent.length > 0);
+          }
           setRunErrorInfo({
             message:
               "The previous agent run stopped producing visible progress while reconnecting, so it was stopped before it could keep looping.",
@@ -1584,6 +1619,7 @@ const AssistantChatInner = forwardRef<
           reconnectAbortRef.current = null;
           setIsReconnecting(false);
           reconnectRunIdRef.current = null;
+          setReconnectAfterSeq(0);
           window.dispatchEvent(
             new CustomEvent("agentNative.chatRunning", {
               detail: { isRunning: false, tabId: tabId || threadId },
@@ -1610,6 +1646,7 @@ const AssistantChatInner = forwardRef<
           reconnectAbortRef.current = null;
           setIsReconnecting(false);
           reconnectRunIdRef.current = null;
+          setReconnectAfterSeq(0);
           window.dispatchEvent(
             new CustomEvent("agentNative.chatRunning", {
               detail: { isRunning: false, tabId: tabId || threadId },
@@ -2360,6 +2397,7 @@ const AssistantChatInner = forwardRef<
       reconnectAbortRef.current?.abort();
       reconnectAbortRef.current = null;
       reconnectRunIdRef.current = null;
+      setReconnectAfterSeq(0);
       setIsReconnecting(false);
       setReconnectFrozen(reconnectContent.length > 0);
     }
@@ -3159,6 +3197,7 @@ const AssistantChatInner = forwardRef<
                         />
                       )}
                       {(isReconnecting || reconnectFrozen) &&
+                        reconnectAfterSeq === 0 &&
                         reconnectContent.length > 0 && (
                           <ReconnectStreamMessage content={reconnectContent} />
                         )}

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

@@ -24,7 +24,12 @@ import React, {
   useState,
   type ReactNode,
 } from "react";
-import { IconSearch, IconMessage } from "@tabler/icons-react";
+import {
+  IconBook2,
+  IconExternalLink,
+  IconSearch,
+  IconMessage,
+} from "@tabler/icons-react";
 import { sendToAgentChat } from "./agent-chat.js";
 import { cn } from "./utils.js";
 
@@ -96,6 +101,7 @@ interface CommandItemProps {
   children: ReactNode;
   keywords?: string[];
   className?: string;
+  deferSelect?: boolean;
 }
 
 function CommandItem({
@@ -103,12 +109,19 @@ function CommandItem({
   children,
   keywords: _keywords,
   className,
+  deferSelect = true,
 }: CommandItemProps) {
   const { onOpenChange, containerRef, setSelectedIndex } =
     useCommandMenuContext();
   const itemRef = useRef<HTMLDivElement>(null);
 
   const handleSelect = () => {
+    if (!deferSelect) {
+      onSelect();
+      onOpenChange(false);
+      return;
+    }
+
     onOpenChange(false);
     // Small delay to let dialog close animation start
     setTimeout(onSelect, 50);
@@ -159,6 +172,68 @@ function CommandSeparator({ className }: { className?: string }) {
   return <div className={cn("-mx-1 my-1 h-px bg-border", className)} />;
 }
 
+export interface CommandMenuDoc {
+  title: string;
+  href: string;
+  description?: string;
+  keywords?: string[];
+}
+
+interface CommandDocsGroupProps {
+  docs: CommandMenuDoc[];
+  heading?: string;
+}
+
+function commandDocSearchText(doc: CommandMenuDoc): string {
+  return [doc.title, doc.description, ...(doc.keywords ?? [])]
+    .filter(Boolean)
+    .join(" ")
+    .toLowerCase();
+}
+
+function filterCommandDocs(docs: CommandMenuDoc[], search: string) {
+  const searchLower = search.trim().toLowerCase();
+  if (!searchLower) return docs;
+  return docs.filter((doc) => commandDocSearchText(doc).includes(searchLower));
+}
+
+function openDocsHref(href: string) {
+  if (/^https?:\/\//i.test(href)) {
+    window.open(href, "_blank", "noopener,noreferrer");
+    return;
+  }
+  window.location.assign(href);
+}
+
+function CommandDocsGroup({ docs, heading = "Docs" }: CommandDocsGroupProps) {
+  if (docs.length === 0) return null;
+
+  return (
+    <CommandGroup heading={heading}>
+      {docs.map((doc) => (
+        <CommandItem
+          key={doc.href}
+          onSelect={() => openDocsHref(doc.href)}
+          keywords={[doc.title, doc.description ?? "", ...(doc.keywords ?? [])]}
+          deferSelect={false}
+          className="items-start py-2"
+        >
+          <IconBook2 className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
+          <span className="min-w-0 flex-1">
+            <span className="block truncate font-medium">{doc.title}</span>
+            {doc.description ? (
+              <span className="mt-0.5 block line-clamp-2 text-xs leading-snug text-muted-foreground">
+                {doc.description}
+              </span>
+            ) : null}
+          </span>
+          <IconExternalLink className="mt-0.5 h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+        </CommandItem>
+      ))}
+    </CommandGroup>
+  );
+}
+
 // ─── Main Component ─────────────────────────────────────────────────────────
 
 export interface CommandMenuProps {
@@ -305,6 +380,18 @@ export function CommandMenu({
         } as Record<string, unknown>);
       }
 
+      if (child.type === CommandDocsGroup) {
+        const docs = Array.isArray(props.docs)
+          ? (props.docs as CommandMenuDoc[])
+          : [];
+        const filteredDocs = filterCommandDocs(docs, search);
+        if (filteredDocs.length === 0) return null;
+        return React.cloneElement(child, {
+          ...props,
+          docs: filteredDocs,
+        } as Record<string, unknown>);
+      }
+
       // If it's a CommandItem, check if it matches search
       if (child.type === CommandItem) {
         if (!search) return child;
@@ -330,7 +417,9 @@ export function CommandMenu({
 
   const filteredChildren = filterChildren(children);
   const hasResults = React.Children.toArray(filteredChildren).some(
-    (child) => React.isValidElement(child) && child.type === CommandGroup,
+    (child) =>
+      React.isValidElement(child) &&
+      (child.type === CommandGroup || child.type === CommandDocsGroup),
   );
 
   return (
@@ -435,6 +524,7 @@ function getTextContent(children: ReactNode): string {
 // Attach sub-components
 CommandMenu.Group = CommandGroup;
 CommandMenu.Item = CommandItem;
+CommandMenu.DocsGroup = CommandDocsGroup;
 CommandMenu.Shortcut = CommandShortcut;
 CommandMenu.Separator = CommandSeparator;
 
@@ -465,4 +555,9 @@ export function useCommandMenuShortcut(onOpen: () => void) {
   }, [onOpen]);
 }
 
-export type { CommandGroupProps, CommandItemProps, CommandShortcutProps };
+export type {
+  CommandDocsGroupProps,
+  CommandGroupProps,
+  CommandItemProps,
+  CommandShortcutProps,
+};

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

@@ -142,7 +142,16 @@ export function ConnectBuilderCard({
           agentNativePath("/_agent-native/builder/branch-waitlist"),
           origin,
         ).href,
-        { method: "POST" },
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            prompt,
+            orgName,
+            pageUrl: window.location.href,
+            source: "connect_builder_card",
+          }),
+        },
       );
       if (!res.ok) {
         const data = await res.json().catch(() => ({}));
@@ -160,7 +169,7 @@ export function ConnectBuilderCard({
       setWaitlistErr(e instanceof Error ? e.message : "Couldn't join waitlist");
       setJoiningWaitlist(false);
     }
-  }, []);
+  }, [orgName, prompt]);
 
   // Combine connect-flow errors, send errors, and waitlist errors.
   const err = sendErr ?? waitlistErr ?? flow.error;

package/corpus/core/src/client/active-run-state.ts

@@ -35,3 +35,19 @@ export function clearActiveRun(): void {
     sessionStorage.removeItem(STORAGE_KEY);
   } catch {}
 }
+
+/** Resume reconnect SSE after the last seen event (0 = replay from the start). */
+export function resolveReconnectAfterSeq(
+  threadId: string,
+  runId: string,
+): number {
+  const stored = getActiveRun();
+  if (
+    stored?.threadId === threadId &&
+    stored?.runId === runId &&
+    Number.isFinite(stored.lastSeq)
+  ) {
+    return stored.lastSeq + 1;
+  }
+  return 0;
+}

package/corpus/core/src/client/guided-questions.tsx

@@ -357,6 +357,37 @@ function optionKey(option: GuidedQuestionOption): string {
   return `${option.value.toLowerCase()}::${option.label.toLowerCase()}`;
 }
 
+/** Stable content hash so poll refreshes do not reset in-progress answers. */
+export function guidedQuestionsFingerprint(
+  questions: GuidedQuestion[],
+): string {
+  return JSON.stringify(
+    questions.map((question) => ({
+      id: question.id,
+      type: question.type,
+      header: question.header ?? null,
+      question: question.question,
+      description: question.description ?? null,
+      multiSelect: question.multiSelect ?? false,
+      required: question.required ?? false,
+      allowOther: question.allowOther ?? null,
+      includeExplore: question.includeExplore ?? null,
+      includeDecide: question.includeDecide ?? null,
+      min: question.min ?? null,
+      max: question.max ?? null,
+      step: question.step ?? null,
+      placeholder: question.placeholder ?? null,
+      options: (question.options ?? question.choices ?? []).map((option) => ({
+        label: option.label,
+        value: option.value,
+        color: option.color ?? null,
+        description: option.description ?? null,
+        recommended: option.recommended ?? false,
+      })),
+    })),
+  );
+}
+
 function withDefaultOptions(question: GuidedQuestion): GuidedQuestionOption[] {
   const base = question.options ?? question.choices ?? [];
   const seen = new Set(base.map(optionKey));
@@ -403,10 +434,14 @@ export function GuidedQuestionFlow({
   className,
 }: GuidedQuestionFlowProps) {
   const [answers, setAnswers] = useState<GuidedQuestionAnswers>({});
+  const questionsFingerprint = useMemo(
+    () => guidedQuestionsFingerprint(questions),
+    [questions],
+  );
 
   useEffect(() => {
     setAnswers({});
-  }, [questions]);
+  }, [questionsFingerprint]);
 
   const setAnswer = useCallback((id: string, value: unknown) => {
     setAnswers((prev) => ({ ...prev, [id]: value }));
@@ -663,23 +698,26 @@ function OptionButton({
     <button
       type="button"
       onClick={onClick}
+      aria-pressed={selected}
       className={cn(
         "group flex min-h-[56px] cursor-pointer items-start gap-2 rounded-md border px-3 py-2 text-left transition-colors",
         selected
-          ? "border-primary bg-primary/10 text-primary"
+          ? "border-primary bg-primary/10 text-foreground ring-2 ring-primary/25"
           : "border-border bg-muted/30 text-muted-foreground hover:border-muted-foreground/50 hover:bg-muted/45 hover:text-foreground",
       )}
     >
-      {multiSelect && (
-        <span
-          className={cn(
-            "mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded border",
-            selected ? "border-primary bg-primary text-primary-foreground" : "",
-          )}
-        >
-          {selected && <IconCheck className="h-3 w-3" />}
-        </span>
-      )}
+      <span
+        className={cn(
+          "mt-0.5 flex h-4 w-4 shrink-0 items-center justify-center border",
+          multiSelect ? "rounded-sm" : "rounded-full",
+          selected
+            ? "border-primary bg-primary text-primary-foreground"
+            : "border-border bg-background",
+        )}
+        aria-hidden
+      >
+        {selected && <IconCheck className="h-3 w-3" />}
+      </span>
       <span className="min-w-0 flex-1">
         <span className="flex flex-wrap items-center gap-1.5 text-sm font-medium leading-5">
           {option.label}
@@ -940,6 +978,17 @@ export function useGuidedQuestionFlow({
     [queryKey, normalizedBrowserTabId],
   );
 
+  const resolvedRefetchInterval =
+    refetchInterval === false
+      ? false
+      : (query: { state: { data?: GuidedQuestionPayload | null } }) => {
+          const activeQuestions = query.state.data?.questions;
+          if (Array.isArray(activeQuestions) && activeQuestions.length > 0) {
+            return false;
+          }
+          return refetchInterval;
+        };
+
   const { data } = useQuery({
     queryKey: resolvedQueryKey,
     queryFn: async () => {
@@ -951,9 +1000,7 @@ export function useGuidedQuestionFlow({
         try {
           const parsed = JSON.parse(text);
           if (Array.isArray(parsed?.questions) && parsed.questions.length > 0) {
-            return { ...parsed, _ts: Date.now() } as GuidedQuestionPayload & {
-              _ts: number;
-            };
+            return parsed as GuidedQuestionPayload;
           }
         } catch {
           return null;
@@ -967,13 +1014,22 @@ export function useGuidedQuestionFlow({
         (await read(stateKey))
       );
     },
-    refetchInterval,
+    refetchInterval: resolvedRefetchInterval,
     structuralSharing: false,
   });
 
   useEffect(() => {
     if (Array.isArray(data?.questions) && data.questions.length > 0) {
-      setPayload(data);
+      setPayload((prev) => {
+        if (
+          prev &&
+          guidedQuestionsFingerprint(prev.questions) ===
+            guidedQuestionsFingerprint(data.questions)
+        ) {
+          return prev;
+        }
+        return data;
+      });
     } else {
       setPayload(null);
     }

package/corpus/core/src/client/index.ts

@@ -707,6 +707,8 @@ export {
   openAgentSidebar,
   submitToAgent,
   type CommandMenuProps,
+  type CommandMenuDoc,
+  type CommandDocsGroupProps,
   type CommandGroupProps,
   type CommandItemProps,
   type CommandShortcutProps,

package/corpus/core/src/client/sse-event-processor.ts

@@ -357,6 +357,10 @@ export function processEvent(
     };
   }
 
+  if (ev.type === "stream_keepalive") {
+    return { action: "continue" };
+  }
+
   if (ev.type === "activity") {
     const tool = ev.tool?.trim() || undefined;
     const label = humanizeToolLabelText(ev.label ?? "Working", tool);
@@ -868,6 +872,7 @@ export async function readSSEStreamRaw(
   toolCallCounter: { value: number },
   tabId: string | undefined,
   onUpdate: (content: ContentPart[]) => void,
+  onSeq?: (seq: number) => void,
 ): Promise<void> {
   const reader = body.getReader();
   const decoder = new TextDecoder();
@@ -907,6 +912,10 @@ export async function readSSEStreamRaw(
         sawDataEvent = true;
         lastMeaningfulEventAt = Date.now();
 
+        if (ev.seq !== undefined && onSeq) {
+          onSeq(ev.seq);
+        }
+
         const { action, autoContinue } = processEvent(
           ev,
           content,

package/corpus/core/src/oauth-tokens/google-refresh.ts

@@ -12,6 +12,7 @@
  */
 
 import { listOAuthAccounts, saveOAuthTokens } from "./store.js";
+import { resolveGoogleProviderCredentialCandidates } from "../server/google-oauth-credentials.js";
 
 const GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
 
@@ -31,29 +32,43 @@ interface RefreshResponse {
 }
 
 async function refreshOne(refreshToken: string): Promise<RefreshResponse> {
-  const clientId = process.env.GOOGLE_CLIENT_ID;
-  const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
-  if (!clientId || !clientSecret) {
+  const credentialCandidates = resolveGoogleProviderCredentialCandidates();
+  if (!credentialCandidates.length) {
     throw new Error("GOOGLE_CLIENT_ID/SECRET not set");
   }
-  const res = await fetch(GOOGLE_TOKEN_URL, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      refresh_token: refreshToken,
-      client_id: clientId,
-      client_secret: clientSecret,
-      grant_type: "refresh_token",
-    }),
-  });
-  const data = (await res.json()) as Record<string, unknown>;
-  if (!res.ok) {
+
+  let data: Record<string, unknown> | null = null;
+  let lastStatusText = "refresh failed";
+  for (const credentials of credentialCandidates) {
+    const res = await fetch(GOOGLE_TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        refresh_token: refreshToken,
+        client_id: credentials.clientId,
+        client_secret: credentials.clientSecret,
+        grant_type: "refresh_token",
+      }),
+    });
+    lastStatusText = res.statusText;
+    data = (await res.json()) as Record<string, unknown>;
+    if (res.ok) return data as unknown as RefreshResponse;
+    if (
+      data.error !== "invalid_grant" &&
+      data.error !== "unauthorized_client" &&
+      data.error !== "invalid_client"
+    ) {
+      break;
+    }
+  }
+
+  if (data) {
     const err = (data.error_description ||
       data.error ||
-      res.statusText) as string;
+      lastStatusText) as string;
     throw new Error(err);
   }
-  return data as unknown as RefreshResponse;
+  throw new Error(lastStatusText);
 }
 
 /**

package/corpus/core/src/provider-api/index.ts

@@ -19,6 +19,7 @@ import {
   saveOAuthTokens,
 } from "../oauth-tokens/index.js";
 import { getCredentialContext } from "../server/request-context.js";
+import { resolveGoogleProviderCredentialCandidates } from "../server/google-oauth-credentials.js";
 import { resolveWorkspaceConnectionCredentialForApp } from "../workspace-connections/credentials.js";
 import type { WorkspaceConnectionTemplateUse } from "../connections/catalog.js";
 import type {
@@ -3432,36 +3433,55 @@ async function refreshGoogleOAuthToken(
   },
   refreshToken: string,
 ): Promise<string> {
-  const clientId = process.env.GOOGLE_CLIENT_ID;
-  const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
-  if (!clientId || !clientSecret) {
+  const credentialCandidates = resolveGoogleProviderCredentialCandidates();
+  if (!credentialCandidates.length) {
     throw new Error(
       "GOOGLE_CLIENT_ID/SECRET not set for Google OAuth refresh.",
     );
   }
-  const res = await fetch("https://oauth2.googleapis.com/token", {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      refresh_token: refreshToken,
-      client_id: clientId,
-      client_secret: clientSecret,
-      grant_type: "refresh_token",
-    }),
-  });
-  const data = (await res.json()) as {
+
+  let data: {
     access_token?: string;
     expires_in?: number;
     token_type?: string;
     scope?: string;
     error?: string;
     error_description?: string;
-  };
-  if (!res.ok || !data.access_token) {
+  } | null = null;
+  let lastStatusText = "refresh failed";
+  for (const credentials of credentialCandidates) {
+    const res = await fetch("https://oauth2.googleapis.com/token", {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        refresh_token: refreshToken,
+        client_id: credentials.clientId,
+        client_secret: credentials.clientSecret,
+        grant_type: "refresh_token",
+      }),
+    });
+    lastStatusText = res.statusText;
+    data = (await res.json()) as {
+      access_token?: string;
+      expires_in?: number;
+      token_type?: string;
+      scope?: string;
+      error?: string;
+      error_description?: string;
+    };
+    if (res.ok && data.access_token) break;
     if (data.error && PERMANENT_GOOGLE_OAUTH_REFRESH_ERRORS.has(data.error)) {
+      continue;
+    }
+    const detail = data.error_description ?? data.error ?? lastStatusText;
+    throw new Error(`Google OAuth refresh failed: ${detail}`);
+  }
+
+  if (!data?.access_token) {
+    if (data?.error && PERMANENT_GOOGLE_OAUTH_REFRESH_ERRORS.has(data.error)) {
       await deleteOAuthTokens(options.oauthProvider, options.accountId);
     }
-    const detail = data.error_description ?? data.error ?? res.statusText;
+    const detail = data?.error_description ?? data?.error ?? lastStatusText;
     throw new Error(`Google OAuth refresh failed: ${detail}`);
   }
   const merged: OAuthTokens = {