@agent-native/core 0.191.0 → 0.192.0-nightly-20260926045737

package/corpus/templates/mail/server/db/schema.ts

@@ -65,6 +65,23 @@ export const automationRules = table("automation_rules", {
   updatedAt: integer("updated_at").notNull(),
 });
 
+export const aiFilterRuleUndo = table(
+  "mail_ai_filter_rule_undo",
+  {
+    id: text("id").primaryKey(),
+    ownerEmail: text("owner_email").notNull(),
+    rulesJson: text("rules_json").notNull(),
+    expiresAt: integer("expires_at").notNull(),
+  },
+  (t) => [
+    index("mail_ai_filter_rule_undo_owner_expiry_idx").on(
+      t.ownerEmail,
+      t.expiresAt,
+    ),
+    index("mail_ai_filter_rule_undo_expires_idx").on(t.expiresAt),
+  ],
+);
+
 export const emailTracking = table("email_tracking", {
   pixelToken: text("pixel_token").primaryKey(),
   messageId: text("message_id").notNull(),

package/corpus/templates/mail/server/lib/ai-filter-rule-undo.ts

@@ -0,0 +1,151 @@
+import { fail } from "@agent-native/core/action";
+import { and, eq, gt, inArray, lt } from "drizzle-orm";
+import { nanoid } from "nanoid";
+
+import { db, schema } from "../db/index.js";
+
+const undoLifetimeSeconds = 60;
+
+export async function purgeExpiredMailAiFilterRuleUndoSnapshots(): Promise<void> {
+  const now = Math.floor(Date.now() / 1_000);
+  await db
+    .delete(schema.aiFilterRuleUndo)
+    .where(lt(schema.aiFilterRuleUndo.expiresAt, now))
+    .returning({ id: schema.aiFilterRuleUndo.id });
+}
+
+export async function clearMailAiFilterRules(
+  ownerEmail: string,
+  ids: string[],
+): Promise<string> {
+  const uniqueIds = [...new Set(ids)];
+  if (
+    uniqueIds.length !== ids.length ||
+    uniqueIds.length === 0 ||
+    uniqueIds.length > 32
+  ) {
+    fail("AI-filter rule ids must be unique and contain 1 to 32 ids.", {
+      errorCode: "invalid_rule_ids",
+      statusCode: 400,
+    });
+  }
+
+  const now = Math.floor(Date.now() / 1_000);
+  const undoId = nanoid(24);
+  return db.transaction(async (tx: any) => {
+    await tx
+      .delete(schema.aiFilterRuleUndo)
+      .where(
+        and(
+          eq(schema.aiFilterRuleUndo.ownerEmail, ownerEmail),
+          lt(schema.aiFilterRuleUndo.expiresAt, now),
+        ),
+      )
+      .returning({ id: schema.aiFilterRuleUndo.id });
+
+    const rules = await tx
+      .select()
+      .from(schema.automationRules)
+      .where(
+        and(
+          eq(schema.automationRules.ownerEmail, ownerEmail),
+          eq(schema.automationRules.domain, "mail"),
+          eq(schema.automationRules.kind, "ai-filter"),
+          eq(schema.automationRules.enabled, 1),
+          inArray(schema.automationRules.id, uniqueIds),
+        ),
+      )
+      .for("update");
+    if (rules.length !== uniqueIds.length) {
+      fail("Some AI-filter rules changed before they could be cleared.", {
+        errorCode: "rules_changed",
+        statusCode: 409,
+      });
+    }
+
+    await tx.insert(schema.aiFilterRuleUndo).values({
+      id: undoId,
+      ownerEmail,
+      rulesJson: JSON.stringify(rules),
+      expiresAt: now + undoLifetimeSeconds,
+    });
+
+    const deleted = await tx
+      .delete(schema.automationRules)
+      .where(
+        and(
+          eq(schema.automationRules.ownerEmail, ownerEmail),
+          eq(schema.automationRules.domain, "mail"),
+          eq(schema.automationRules.kind, "ai-filter"),
+          eq(schema.automationRules.enabled, 1),
+          inArray(schema.automationRules.id, uniqueIds),
+        ),
+      )
+      .returning({ id: schema.automationRules.id });
+    if (deleted.length !== uniqueIds.length) {
+      fail("Some AI-filter rules changed before they could be cleared.", {
+        errorCode: "rules_changed",
+        statusCode: 409,
+      });
+    }
+    return undoId;
+  });
+}
+
+export async function restoreMailAiFilterRules(
+  ownerEmail: string,
+  undoId: string,
+): Promise<void> {
+  const now = Math.floor(Date.now() / 1_000);
+  await db.transaction(async (tx: any) => {
+    const [undo] = await tx
+      .select()
+      .from(schema.aiFilterRuleUndo)
+      .where(
+        and(
+          eq(schema.aiFilterRuleUndo.id, undoId),
+          eq(schema.aiFilterRuleUndo.ownerEmail, ownerEmail),
+          gt(schema.aiFilterRuleUndo.expiresAt, now),
+        ),
+      )
+      .for("update");
+    if (!undo) {
+      fail("This rule undo has expired or was already used.", {
+        errorCode: "undo_expired",
+        statusCode: 410,
+      });
+    }
+
+    const rules = JSON.parse(undo.rulesJson);
+    if (
+      !Array.isArray(rules) ||
+      rules.some(
+        (rule) =>
+          rule.ownerEmail !== ownerEmail ||
+          rule.domain !== "mail" ||
+          rule.kind !== "ai-filter" ||
+          rule.enabled !== 1,
+      )
+    ) {
+      throw new Error("AI-filter undo snapshot is invalid");
+    }
+
+    await tx.insert(schema.automationRules).values(rules);
+    const consumed = await tx
+      .delete(schema.aiFilterRuleUndo)
+      .where(
+        and(
+          eq(schema.aiFilterRuleUndo.id, undoId),
+          eq(schema.aiFilterRuleUndo.ownerEmail, ownerEmail),
+          gt(schema.aiFilterRuleUndo.expiresAt, now),
+        ),
+      )
+      .returning({ id: schema.aiFilterRuleUndo.id });
+    if (consumed.length !== 1) {
+      fail("This rule undo has expired or was already used.", {
+        errorCode: "undo_expired",
+        statusCode: 410,
+      });
+    }
+  });
+}

package/corpus/templates/mail/server/lib/automations.ts

@@ -1,9 +1,24 @@
+import { fail } from "@agent-native/core/action";
+import {
+  getJevContextCredentials,
+  isJevEnabled,
+} from "@agent-native/core/server";
 import { and, eq, inArray } from "drizzle-orm";
 import { nanoid } from "nanoid";
 
 import type { AutomationAction, AutomationRule } from "../../shared/types.js";
 import { db, schema } from "../db/index.js";
 
+export async function assertMailJevEnabled(ownerEmail: string): Promise<void> {
+  const credentials = await getJevContextCredentials(ownerEmail);
+  if (!(await isJevEnabled(credentials))) {
+    fail("Jev is not enabled for this account.", {
+      errorCode: "jev_not_enabled",
+      statusCode: 403,
+    });
+  }
+}
+
 export function toApiRule(row: any): AutomationRule {
   const kind = row.kind ?? "automation";
   if (kind !== "automation" && kind !== "ai-filter") {
@@ -85,6 +100,24 @@ export async function updateAutomationRule(
     kind?: "automation" | "ai-filter";
   },
 ): Promise<AutomationRule> {
+  const [existing] = await db
+    .select()
+    .from(schema.automationRules)
+    .where(ownedRule(ownerEmail, id));
+  if (!existing) throw new Error("Rule not found");
+
+  const existingIsMailAiFilter =
+    existing.domain === "mail" &&
+    (existing.kind ?? "automation") === "ai-filter";
+  const nextDomain = patch.domain ?? existing.domain;
+  const nextKind = patch.kind ?? existing.kind ?? "automation";
+  const disableOnly =
+    Object.keys(patch).length === 1 && patch.enabled === false;
+  const nextIsMailAiFilter = nextDomain === "mail" && nextKind === "ai-filter";
+  if ((existingIsMailAiFilter || nextIsMailAiFilter) && !disableOnly) {
+    await assertMailJevEnabled(ownerEmail);
+  }
+
   const updates: Record<string, any> = {
     updatedAt: Math.floor(Date.now() / 1_000),
   };
@@ -134,6 +167,7 @@ export async function consolidateAutomationRules(
     actions: AutomationAction[];
   },
 ): Promise<boolean> {
+  await assertMailJevEnabled(ownerEmail);
   const ids = [input.id, ...input.duplicateIds];
   if (new Set(ids).size !== ids.length) return false;
 

package/corpus/templates/mail/server/plugins/db.ts

@@ -300,6 +300,24 @@ CREATE INDEX IF NOT EXISTS idx_mail_inbox_push_invalidations_owner_account
 ALTER TABLE mail_sync_accounts
   ADD COLUMN IF NOT EXISTS last_push_generation BIGINT NOT NULL DEFAULT 0;`,
     },
+    {
+      version: 27,
+      name: "mail-ai-filter-rule-undo",
+      sql: `CREATE TABLE IF NOT EXISTS mail_ai_filter_rule_undo (
+    id TEXT PRIMARY KEY,
+    owner_email TEXT NOT NULL,
+    rules_json TEXT NOT NULL,
+    expires_at BIGINT NOT NULL
+  );
+CREATE INDEX IF NOT EXISTS mail_ai_filter_rule_undo_owner_expiry_idx
+  ON mail_ai_filter_rule_undo(owner_email, expires_at);`,
+    },
+    {
+      version: 28,
+      name: "mail-ai-filter-rule-undo-expiry-index",
+      sql: `CREATE INDEX IF NOT EXISTS mail_ai_filter_rule_undo_expires_idx
+  ON mail_ai_filter_rule_undo(expires_at);`,
+    },
   ],
   { table: "mail_migrations" },
 );

package/corpus/templates/mail/server/plugins/mail-jobs.ts

@@ -3,6 +3,7 @@ import { listOAuthAccounts } from "@agent-native/core/oauth-tokens";
 import { startIntervalJob } from "@agent-native/core/server/interval-job";
 import { z } from "zod";
 
+import { purgeExpiredMailAiFilterRuleUndoSnapshots } from "../lib/ai-filter-rule-undo.js";
 import { processAutomations } from "../lib/automation-engine.js";
 import { getClientForAccount, startWatch } from "../lib/google-auth.js";
 import {
@@ -136,6 +137,11 @@ export default () => {
   // overlap the next one and send duplicate mail.
   startIntervalJob(
     async () => {
+      try {
+        await purgeExpiredMailAiFilterRuleUndoSnapshots();
+      } catch (err) {
+        console.error("[mail-jobs] AI-filter undo cleanup failed:", err);
+      }
       try {
         await processJobs();
       } catch (err) {

package/dist/client/AssistantChat.js

@@ -2582,6 +2582,10 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
             : getActiveRun()?.runId === runId
                 ? (getActiveRun()?.turnId ?? undefined)
                 : undefined;
+        const reconnectEventIdentity = {
+            runId,
+            ...(logicalTurnId ? { turnId: logicalTurnId } : {}),
+        };
         if (reconnectRunIdRef.current === runId)
             return true;
         // SINGLE-READER OWNERSHIP: never start a second reader while the
@@ -2664,7 +2668,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         setReconnectFrozen(false);
         setReconnectContent([]);
         window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-            detail: { isRunning: true, tabId: tabId || threadId },
+            detail: {
+                isRunning: true,
+                tabId: tabId || threadId,
+                ...reconnectEventIdentity,
+            },
         }));
         const abortCtrl = new AbortController();
         reconnectAbortRef.current = abortCtrl;
@@ -2979,7 +2987,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                             : RECONNECT_EMPTY_RETRY_MESSAGE,
                     });
                     window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                        detail: { isRunning: false, tabId: tabId || threadId },
+                        detail: {
+                            isRunning: false,
+                            tabId: tabId || threadId,
+                            ...reconnectEventIdentity,
+                        },
                     }));
                     return;
                 }
@@ -3015,6 +3027,7 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                         isRunning: false,
                         tabId: tabId || threadId,
                         reason: "failed",
+                        ...reconnectEventIdentity,
                     },
                 }));
                 return;
@@ -3055,7 +3068,11 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
                     reconnectAutoRecoveryCountRef.current = 0;
                 }
                 window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                    detail: { isRunning: false, tabId: tabId || threadId },
+                    detail: {
+                        isRunning: false,
+                        tabId: tabId || threadId,
+                        ...reconnectEventIdentity,
+                    },
                 }));
             }
             // Skip the final refresh when the adapter runtime is live — importing

package/dist/client/BuilderReferralInviteRow.d.ts

@@ -0,0 +1,3 @@
+export declare function BuilderReferralInviteRow({ className, }: {
+    className?: string;
+}): import("react").JSX.Element | null;

package/dist/client/BuilderReferralInviteRow.js

@@ -0,0 +1,16 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { ShareCopyRow } from "@agent-native/toolkit/sharing";
+import { writeClipboardText } from "./clipboard.js";
+import { useT } from "./i18n.js";
+import { useActionQuery } from "./use-action.js";
+import { cn } from "./utils.js";
+export function BuilderReferralInviteRow({ className, }) {
+    const t = useT();
+    const referralQuery = useActionQuery("get-builder-referral-info", {}, { staleTime: 5 * 60_000 });
+    const referralInfo = referralQuery.data;
+    if (!referralInfo?.eligible || !referralInfo.inviteUrl)
+        return null;
+    return (_jsx(ShareCopyRow, { className: cn("min-w-0", className), value: referralInfo.inviteUrl, label: t("agentChat.usage.inviteFriends"), description: t("agentChat.usage.inviteCredits", {
+            amount: referralInfo.creditsPerReferral.toLocaleString(),
+        }), copyLabel: t("agentChat.usage.copyInviteLink"), copiedLabel: t("agentChat.usage.inviteLinkCopied"), onCopy: writeClipboardText }));
+}

package/dist/client/agent-chat-adapter.js

@@ -1884,7 +1884,7 @@ export function createAgentChatAdapter(options) {
             // Signal that generation is starting
             if (typeof window !== "undefined") {
                 window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                    detail: { isRunning: true, tabId },
+                    detail: { isRunning: true, tabId, turnId },
                 }));
             }
             const content = [];
@@ -1907,9 +1907,10 @@ export function createAgentChatAdapter(options) {
                     pendingTurnBelongsToSurface &&
                     (pendingTurn.threadId !== threadId || pendingTurn.turnId !== turnId));
             };
-            const activeRunMatchesTab = (activeRun) => !activeRun?.tabId ||
-                !activeRunTabId ||
-                activeRun.tabId === activeRunTabId;
+            const activeRunMatchesTab = (activeRun) => !activeRun ||
+                (activeRun.tabId
+                    ? !activeRunTabId || activeRun.tabId === activeRunTabId
+                    : !threadId || activeRun.threadId === threadId);
             const ownsActiveRunState = () => {
                 if (hasPendingSuccessorRequest())
                     return false;
@@ -1949,7 +1950,7 @@ export function createAgentChatAdapter(options) {
                     return;
                 dispatchTerminalChatUiCleanup(tabId);
                 window.dispatchEvent(new CustomEvent("agentNative.chatRunning", {
-                    detail: { isRunning: false, tabId },
+                    detail: { isRunning: false, tabId, turnId },
                 }));
             };
             const settleTerminalChatRun = () => {

package/dist/client/chat/run-recovery.js

@@ -11,6 +11,7 @@ import { isCreditsLimitErrorCode } from "../../agent/engine/error-detail.js";
 import { buildSettingsRoute } from "../../navigation/index.js";
 import { withBuilderUtmTrackingParams } from "../../shared/builder-link-tracking.js";
 import { agentNativePath } from "../api-path.js";
+import { BuilderReferralInviteRow } from "../BuilderReferralInviteRow.js";
 import { writeClipboardText } from "../clipboard.js";
 import { isProviderAuthenticationError, localizeKnownChatErrorText, } from "../error-format.js";
 import { useFormatters, useT } from "../i18n.js";
@@ -322,11 +323,11 @@ export function RunErrorRecoveryCard({ info, onContinue, onRetry, onFork, onDism
                         : handleMissingProviderConnected }), _jsx("div", { className: "flex justify-center px-3 pt-1", children: _jsxs("button", { type: "button", onClick: handleMissingProviderRetry, disabled: retryRequested, className: "inline-flex h-8 items-center gap-1.5 rounded-md bg-foreground px-3 text-xs font-medium text-background hover:opacity-90 disabled:cursor-wait disabled:opacity-60", children: [_jsx(IconRefresh, { size: 13 }), t("agentChat.common.retry")] }) })] }));
     }
     if (isBuilderCreditsLimit) {
-        return (_jsx("div", { className: "min-w-0 rounded-lg border border-border bg-card p-3 text-sm", children: _jsxs("div", { className: "flex min-w-0 flex-wrap items-center gap-3", children: [_jsx("p", { className: "min-w-0 flex-1 font-medium text-foreground", children: t("agentChat.errorMessages.creditsLimitReached", {
-                            defaultValue: "You've reached your AI credits limit.",
-                        }) }), _jsx(Button, { asChild: true, size: "sm", children: _jsxs("a", { href: builderSubscriptionUrl, target: "_blank", rel: "noreferrer", children: [t("agentChat.errorMessages.addCreditsInBuilder", {
-                                    defaultValue: "Add credits in Builder",
-                                }), _jsx(IconArrowUpRight, {})] }) }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }) }));
+        return (_jsxs("div", { className: "min-w-0 rounded-lg border border-border bg-card p-3 text-sm", children: [_jsxs("div", { className: "flex min-w-0 flex-wrap items-center gap-3", children: [_jsx("p", { className: "min-w-0 flex-1 font-medium text-foreground", children: t("agentChat.errorMessages.creditsLimitReached", {
+                                defaultValue: "You've reached your AI credits limit.",
+                            }) }), _jsx(Button, { asChild: true, size: "sm", children: _jsxs("a", { href: builderSubscriptionUrl, target: "_blank", rel: "noreferrer", children: [t("agentChat.errorMessages.addCreditsInBuilder", {
+                                        defaultValue: "Add credits in Builder",
+                                    }), _jsx(IconArrowUpRight, {})] }) }), _jsx("button", { type: "button", onClick: onDismiss, "aria-label": t("agentChat.common.dismiss"), className: "flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { size: 14 }) })] }), _jsx(BuilderReferralInviteRow, { className: "mt-3 border-t border-border/70 pt-3" })] }));
     }
     return (_jsxs("div", { className: "min-w-0 rounded-lg border border-amber-500/25 bg-amber-500/[0.06] p-3 text-sm", children: [_jsxs("div", { className: "flex items-start gap-2", children: [_jsx("span", { className: "mt-0.5 flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-amber-500/10 text-amber-700 dark:text-amber-300", children: _jsx(IconAlertTriangle, { size: 14 }) }), _jsxs("div", { className: "min-w-0 flex-1", children: [_jsx("div", { className: "font-medium text-foreground", children: runErrorHeadline(info, {
                                     recoverable: t("agentChat.error.stopped"),

package/dist/client/settings/UsageSection.js

@@ -9,6 +9,7 @@ import { IconArrowUpRight, IconBell, IconChartLine, IconChevronDown, IconLoader2
 import { useState } from "react";
 import { Link } from "react-router";
 import { withBuilderUtmTrackingParams } from "../../shared/builder-link-tracking.js";
+import { BuilderReferralInviteRow } from "../BuilderReferralInviteRow.js";
 import { useT } from "../i18n.js";
 import { useActionMutation, useActionQuery } from "../use-action.js";
 const builderAddCreditsUrl = withBuilderUtmTrackingParams("https://builder.io/account/subscription?signupSource=agent-native", { content: "usage_credit_balance" });
@@ -192,7 +193,7 @@ function BuilderCreditUsagePanel({ usage }) {
                             } }) }), _jsx("div", { className: "mt-1 text-right text-xs tabular-nums text-muted-foreground", children: t("agentChat.usage.creditRemaining", {
                             defaultValue: "{{amount}} remaining",
                             amount: remaining,
-                        }) })] })] }));
+                        }) }), _jsx(BuilderReferralInviteRow, { className: "mt-4 border-t border-border/70 pt-4" })] })] }));
 }
 function AlertEditor({ draft, onChange, onSave, onCancel, isPending, }) {
     const t = useT();

package/dist/client/settings/index.d.ts

@@ -2,7 +2,7 @@ export { AgentSettingsContent, areExtensionSettingsEnabled, SettingsPanel, useAg
 export { getAgentSettingsSearchTabs, type AgentSettingsSearchTab, } from "./agent-settings-search.js";
 export { SettingsTabsPage, type SettingsSearchEntry, type SettingsTabItem, type SettingsTabsPageProps, } from "./SettingsTabsPage.js";
 export { AccountSettingsCard, AccountSettingsForm, type AccountSettingsCardProps, type AccountSettingsFormProps, } from "./AccountSettingsCard.js";
-export { openBuilderConnectPopup, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, type BuilderConnectFlow, type BuilderConnectFlowOptions, type BuilderConnectStartOptions, type BuilderStatus, type OpenBuilderConnectPopupOptions, } from "./useBuilderStatus.js";
+export { hasBuilderOAuthCredential, openBuilderConnectPopup, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, type BuilderConnectFlow, type BuilderConnectFlowOptions, type BuilderConnectStartOptions, type BuilderStatus, type OpenBuilderConnectPopupOptions, } from "./useBuilderStatus.js";
 export { DeferredBuilderConnectPopover as BuilderConnectPopover } from "./deferred-builder-connect-popover.js";
 export type { BuilderConnectPopoverProps } from "./BuilderConnectPopover.js";
 export { NewKeyMenu, normalizeKeyName, type NewKeyMenuProps, type NewKeyOption, } from "./NewKeyMenu.js";

package/dist/client/settings/index.js

@@ -2,7 +2,7 @@ export { AgentSettingsContent, areExtensionSettingsEnabled, SettingsPanel, useAg
 export { getAgentSettingsSearchTabs, } from "./agent-settings-search.js";
 export { SettingsTabsPage, } from "./SettingsTabsPage.js";
 export { AccountSettingsCard, AccountSettingsForm, } from "./AccountSettingsCard.js";
-export { openBuilderConnectPopup, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, } from "./useBuilderStatus.js";
+export { hasBuilderOAuthCredential, openBuilderConnectPopup, useBuilderConnectFlow, useBuilderStatus, withBuilderConnectTrackingParams, } from "./useBuilderStatus.js";
 export { DeferredBuilderConnectPopover as BuilderConnectPopover } from "./deferred-builder-connect-popover.js";
 export { NewKeyMenu, normalizeKeyName, } from "./NewKeyMenu.js";
 export { SecretsSection } from "./SecretsSection.js";

package/dist/client/settings/useBuilderStatus.d.ts

@@ -59,6 +59,9 @@ export interface BuilderStatus {
         at: number;
     };
 }
+export declare function hasBuilderOAuthCredential(status: Pick<BuilderStatus, "configured" | "envManaged"> & {
+    credentialSource?: BuilderStatus["credentialSource"] | null;
+}): boolean;
 /**
  * Fetches Builder connection status from the neutral connection-status route.
  * The legacy /_agent-native/builder/status route remains available for older
@@ -85,7 +88,7 @@ export interface BuilderConnectFlowOptions {
     trackingSource?: string;
     /** Product flow that needed Builder connect, e.g. connect_llm. */
     trackingFlow?: string;
-    /** Invoked after the status poll first sees `configured: true`. */
+    /** Invoked when the current user/org/workspace Builder credential is ready. */
     onConnected?: (state: {
         orgName: string | null;
     }) => void | Promise<void>;

package/dist/client/settings/useBuilderStatus.js

@@ -7,6 +7,11 @@ import { openMcpAppHostLink } from "../mcp-app-host.js";
 import { oauthPopupWaitingUrl } from "../oauth-popup.js";
 import { scheduleAfterPaint } from "../use-after-paint.js";
 import { usePollLoop } from "../use-poll-loop.js";
+export function hasBuilderOAuthCredential(status) {
+    return (status.configured &&
+        status.credentialSource !== "env" &&
+        (!status.envManaged || status.credentialSource != null));
+}
 /**
  * Fetches Builder connection status from the neutral connection-status route.
  * The legacy /_agent-native/builder/status route remains available for older
@@ -660,10 +665,12 @@ export function useBuilderConnectFlow(opts = {}) {
             statusConnectUrlAtRef.current = nextConnectUrl ? Date.now() : null;
             const org = s.orgName ?? null;
             setOrgName(org);
-            if (s.configured) {
+            const hasOAuthCredential = hasBuilderOAuthCredential(s);
+            if (hasOAuthCredential) {
                 connectStartedAtRef.current = null;
+                setConnecting(false);
             }
-            if (s.configured && !notifiedConnectedRef.current) {
+            if (hasOAuthCredential && !notifiedConnectedRef.current) {
                 notifiedConnectedRef.current = true;
                 notifyAgentEngineConfiguredChanged("builder-status");
                 try {
@@ -673,7 +680,7 @@ export function useBuilderConnectFlow(opts = {}) {
                     // The caller's callback is a UI convenience; status is already set.
                 }
             }
-            else if (!s.configured) {
+            else if (!hasOAuthCredential) {
                 notifiedConnectedRef.current = false;
             }
             // Surface persisted auth-failure messages on idle refreshes, but don't
@@ -993,31 +1000,39 @@ export function useBuilderConnectFlow(opts = {}) {
         if (started == null)
             return;
         const s = await fetchStatus(signal, connectAttemptIdRef.current ?? undefined);
-        if (!mountedRef.current)
+        if (!mountedRef.current || connectStartedAtRef.current !== started) {
             return;
-        if (s)
+        }
+        const orgName = s?.orgName ?? null;
+        if (s) {
+            if (statusUnavailableRef.current) {
+                statusUnavailableRef.current = false;
+                setError(null);
+            }
+            setHasFetchedStatus(true);
             setStatusResolved(true);
-        if (s?.configured) {
-            setConfigured(true);
+            setConfigured(!!s.configured);
             setCodeChangeConfigured(isCodeChangeConfigured(s));
             setEnvManaged(!!s.envManaged);
             setCredentialSource(s.credentialSource ?? null);
             setCanDisconnect(!!s.canDisconnect);
             setAgentNativeProvisioningEnabled(!!s.agentNativeProvisioningEnabled);
             setAgentNativeProvisioningToken(s.agentNativeProvisioningToken ?? null);
-            setAccountExists(false);
+            setAccountExists(s.connectError?.code === "account_exists");
             setBuilderEnabled(!!s.builderEnabled);
             const nextConnectUrl = s.connectUrl ?? null;
             setStatusConnectUrl(nextConnectUrl);
             statusConnectUrlAtRef.current = nextConnectUrl ? Date.now() : null;
-            const org = s.orgName ?? null;
-            setOrgName(org);
+            setOrgName(orgName);
+        }
+        if (s && hasBuilderOAuthCredential(s)) {
+            setAccountExists(false);
             setConnecting(false);
             connectStartedAtRef.current = null;
             notifiedConnectedRef.current = true;
             notifyAgentEngineConfiguredChanged("builder-connect");
             try {
-                await onConnectedRef.current?.({ orgName: org });
+                await onConnectedRef.current?.({ orgName });
             }
             catch {
                 // coercion-ok: the connection itself succeeded and the UI state is
@@ -1162,7 +1177,7 @@ export function useBuilderConnectFlow(opts = {}) {
                         connectStartedAtRef.current !== started) {
                         return;
                     }
-                    if (s?.configured ||
+                    if ((s && hasBuilderOAuthCredential(s)) ||
                         isCurrentConnectError(s?.connectError, started)) {
                         break;
                     }
@@ -1186,7 +1201,8 @@ export function useBuilderConnectFlow(opts = {}) {
                 }
                 if (callbackSuccessInFlightAtRef.current === started) {
                     callbackSuccessInFlightAtRef.current = null;
-                    if (popupClosedAtRef.current !== null && !s?.configured) {
+                    if (popupClosedAtRef.current !== null &&
+                        (!s || !hasBuilderOAuthCredential(s))) {
                         popupClosedAtRef.current = Date.now();
                     }
                 }
@@ -1196,15 +1212,15 @@ export function useBuilderConnectFlow(opts = {}) {
             }
             if (!s)
                 return;
-            if (!s.configured) {
+            if (!hasBuilderOAuthCredential(s)) {
                 const connectError = isCurrentConnectError(s?.connectError, started)
                     ? s?.connectError
                     : null;
                 setHasFetchedStatus(true);
                 if (s) {
                     setStatusResolved(true);
-                    setConfigured(false);
-                    setCodeChangeConfigured(false);
+                    setConfigured(!!s.configured);
+                    setCodeChangeConfigured(isCodeChangeConfigured(s));
                     setEnvManaged(!!s.envManaged);
                     setCredentialSource(s.credentialSource ?? null);
                     setCanDisconnect(!!s.canDisconnect);

package/dist/client/use-agent-chat-running-threads.d.ts

@@ -8,6 +8,8 @@ export interface AgentChatRunningEventDetail {
     threadId?: string;
     /** Legacy alias used by AssistantChat and embedded chat frames. */
     tabId?: string;
+    /** Logical chat turn that may continue across multiple server runs. */
+    turnId?: string;
     runId?: string;
     reason?: string;
 }

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/framework-tools.d.ts

@@ -14,7 +14,7 @@ import { type DatabaseToolsOption } from "./scripts/db/tool-mode.js";
  * when it names them in `initialToolNames`. They stay in the searchable registry
  * either way.
  */
-export declare const FRAMEWORK_TOOL_GROUPS: readonly ["sharing", "review", "history", "featureFlags", "launchDarkly", "labs", "localization", "audit", "contextXray", "userProfile", "automation", "docs", "resources", "web", "workspaceApps", "chat", "email", "emailCatalog", "workspaceUserGroups", "orgServiceTokens", "orgAdministration"];
+export declare const FRAMEWORK_TOOL_GROUPS: readonly ["sharing", "review", "history", "featureFlags", "launchDarkly", "labs", "localization", "audit", "contextXray", "userProfile", "automation", "docs", "resources", "browserSessions", "web", "workspaceApps", "chat", "email", "emailCatalog", "workspaceUserGroups", "orgServiceTokens", "orgAdministration"];
 export type FrameworkToolGroup = (typeof FRAMEWORK_TOOL_GROUPS)[number];
 /**
  * Per-group switches for the framework's own agent tools. Every group defaults
@@ -71,6 +71,8 @@ export interface FrameworkToolsOption {
     docs?: boolean;
     /** The `resources` tool — workspace notes, memory, and context files. */
     resources?: boolean;
+    /** Raw browser-session controls such as `run-browser-session-action`. */
+    browserSessions?: boolean;
     /** `web-request` and `web-search`. */
     web?: boolean;
     /** `describe-workspace-apps` and `call-agent` for cross-app delegation. */

package/dist/framework-tools.js

@@ -28,6 +28,7 @@ export const FRAMEWORK_TOOL_GROUPS = [
     "automation",
     "docs",
     "resources",
+    "browserSessions",
     "web",
     "workspaceApps",
     "chat",
@@ -161,6 +162,7 @@ export const CORE_ACTION_GROUPS = {
     "manage-usage-alert": "automation",
     "get-usage-metrics": "automation",
     "get-builder-credit-usage": "automation",
+    "get-builder-referral-info": "automation",
     "context-manifest-get": "contextXray",
     "context-preview-get": "contextXray",
     "context-pin": "contextXray",