@agent-native/core 0.77.6 → 0.77.8

package/corpus/core/src/sharing/actions/share-resource.ts

@@ -1,4 +1,4 @@
-import { and, eq } from "drizzle-orm";
+import { and, eq, sql, type SQL } from "drizzle-orm";
 import { z } from "zod";
 
 import { defineAction } from "../../action.js";
@@ -89,6 +89,25 @@ function nanoid(size = 12): string {
   return id;
 }
 
+function normalizePrincipalId(
+  principalType: "user" | "org",
+  principalId: string,
+): string {
+  return principalType === "user"
+    ? principalId.trim().toLowerCase()
+    : principalId;
+}
+
+function principalIdMatches(
+  sharesTable: any,
+  principalType: "user" | "org",
+  principalId: string,
+): SQL {
+  return principalType === "user"
+    ? sql`lower(${sharesTable.principalId}) = ${principalId}`
+    : eq(sharesTable.principalId, principalId);
+}
+
 /**
  * Returns true if the given email is either an active member of `orgId` or
  * has a pending invitation to `orgId`. Used by resources whose registration
@@ -163,6 +182,10 @@ export default defineAction({
     );
     const actor = getRequestUserEmail();
     if (!actor) throw new ForbiddenError("Not signed in");
+    const principalId = normalizePrincipalId(
+      args.principalType,
+      args.principalId,
+    );
     const beforeExtensionTargets = await getExtensionShareChangeTargets(
       args.resourceType,
       args.resourceId,
@@ -176,10 +199,10 @@ export default defineAction({
         );
       }
       if (args.principalType === "user") {
-        const ok = await isOrgMemberOrInvited(resourceOrgId, args.principalId);
+        const ok = await isOrgMemberOrInvited(resourceOrgId, principalId);
         if (!ok) {
           throw new ForbiddenError(
-            `${args.principalId} is not in your organization. Invite them to the organization first, then share.`,
+            `${principalId} is not in your organization. Invite them to the organization first, then share.`,
           );
         }
       } else if (args.principalType === "org") {
@@ -187,7 +210,7 @@ export default defineAction({
         // extension code in the viewer's auth context — the same threat
         // model that blocks public + cross-org user shares. Pin org-
         // principal shares to the resource's own org.
-        if (args.principalId !== resourceOrgId) {
+        if (principalId !== resourceOrgId) {
           throw new ForbiddenError(
             `${reg.displayName} can only be shared with its own organization, not a different one.`,
           );
@@ -203,7 +226,7 @@ export default defineAction({
         and(
           eq(reg.sharesTable.resourceId, args.resourceId),
           eq(reg.sharesTable.principalType, args.principalType),
-          eq(reg.sharesTable.principalId, args.principalId),
+          principalIdMatches(reg.sharesTable, args.principalType, principalId),
         ),
       );
 
@@ -225,7 +248,7 @@ export default defineAction({
       id,
       resourceId: args.resourceId,
       principalType: args.principalType,
-      principalId: args.principalId,
+      principalId,
       role: args.role,
       createdBy: actor,
       createdAt: new Date().toISOString(),
@@ -240,7 +263,7 @@ export default defineAction({
       args.notify !== false &&
       args.principalType === "user" &&
       isEmailConfigured() &&
-      !isSyntheticQaEmail(args.principalId)
+      !isSyntheticQaEmail(principalId)
     ) {
       try {
         const titleCol = reg.titleColumn ?? "title";
@@ -268,12 +291,12 @@ export default defineAction({
           heading: "You've been given access",
           paragraphs: [
             `${emailStrong(actor)} has shared the ${reg.displayName} ${emailStrong(resourceTitle)} with you as a ${emailStrong(args.role)}.`,
-            `Use the button below to open it. If prompted, sign in with ${emailStrong(args.principalId)}.`,
+            `Use the button below to open it. If prompted, sign in with ${emailStrong(principalId)}.`,
           ],
           cta: { label: `Open ${reg.displayName}`, url: notificationUrl },
           footer: `You received this because ${actor} granted you ${args.role} access.`,
         });
-        await sendEmail({ to: args.principalId, subject, html, text });
+        await sendEmail({ to: principalId, subject, html, text });
       } catch (err) {
         console.error(
           "[share-resource] failed to send share notification:",

package/corpus/core/src/sharing/actions/unshare-resource.ts

@@ -1,4 +1,4 @@
-import { and, eq } from "drizzle-orm";
+import { and, eq, sql, type SQL } from "drizzle-orm";
 import { z } from "zod";
 
 import { defineAction } from "../../action.js";
@@ -9,6 +9,25 @@ import {
   notifyExtensionShareChanged,
 } from "./extension-change.js";
 
+function normalizePrincipalId(
+  principalType: "user" | "org",
+  principalId: string,
+): string {
+  return principalType === "user"
+    ? principalId.trim().toLowerCase()
+    : principalId;
+}
+
+function principalIdMatches(
+  sharesTable: any,
+  principalType: "user" | "org",
+  principalId: string,
+): SQL {
+  return principalType === "user"
+    ? sql`lower(${sharesTable.principalId}) = ${principalId}`
+    : eq(sharesTable.principalId, principalId);
+}
+
 export default defineAction({
   description:
     "Revoke a previously granted share. Owner or admin role required.",
@@ -28,13 +47,17 @@ export default defineAction({
       args.resourceId,
     );
     const db = reg.getDb() as any;
+    const principalId = normalizePrincipalId(
+      args.principalType,
+      args.principalId,
+    );
     await db
       .delete(reg.sharesTable)
       .where(
         and(
           eq(reg.sharesTable.resourceId, args.resourceId),
           eq(reg.sharesTable.principalType, args.principalType),
-          eq(reg.sharesTable.principalId, args.principalId),
+          principalIdMatches(reg.sharesTable, args.principalType, principalId),
         ),
       );
     await notifyExtensionShareChanged(

package/corpus/core/src/sharing/registry.ts

@@ -78,6 +78,15 @@ export interface ShareableResourceRegistration {
     userEmail?: string;
     orgId?: string;
   };
+  /**
+   * When true, direct ownership is recognized by owner_email regardless of the
+   * caller's active org. Use this only for resource types where the template's
+   * own actions already treat owner_email as the cross-org authority and list
+   * views add their own org filters.
+   *
+   * Default: `false`.
+   */
+  ownerAccessIgnoresOrg?: boolean;
 }
 
 // Stash the registry on globalThis so it survives SSR bundle duplication.

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

@@ -1843,6 +1843,9 @@ function createAgentNativeConfig(
     define: {
       ...(userConfig.define ?? {}),
       ...(options.define ?? {}),
+      __AGENT_NATIVE_BUILD_GA_MEASUREMENT_ID__: JSON.stringify(
+        process.env.GA_MEASUREMENT_ID?.trim() || "",
+      ),
       // Framework route warmup controls how SSR `.data` routes are fetched:
       // ordinary fetches keep them CDN-cacheable, while native prefetch headers
       // can be refused before the CDN/origin sees the request. Keep this value

package/corpus/templates/analytics/actions/data-source-status.ts

@@ -151,32 +151,43 @@ export default defineAction({
     );
     const visibleKeys = new Set(results.map((result) => result.key));
     const providers = credentialProviderConfigs
-      .filter((provider) =>
-        provider.requiredKeys.every((key) => visibleKeys.has(key)),
-      )
+      .filter((provider) => {
+        const requiredMode = provider.requiredMode ?? "all";
+        return requiredMode === "any"
+          ? provider.requiredKeys.some((key) => visibleKeys.has(key))
+          : provider.requiredKeys.every((key) => visibleKeys.has(key));
+      })
       .map((provider) => {
         const optionalKeys = provider.optionalKeys ?? [];
-        const missingRequiredKeys = provider.requiredKeys.filter(
-          (key) => !configuredKeys.has(key),
-        );
+        const requiredMode = provider.requiredMode ?? "all";
+        const hasRequiredCredentials =
+          requiredMode === "any"
+            ? provider.requiredKeys.some((key) => configuredKeys.has(key))
+            : provider.requiredKeys.every((key) => configuredKeys.has(key));
+        const missingRequiredKeys = hasRequiredCredentials
+          ? []
+          : provider.requiredKeys.filter((key) => !configuredKeys.has(key));
         const configuredProviderKeys = [
           ...provider.requiredKeys,
           ...optionalKeys,
         ].filter((key) => configuredKeys.has(key));
+        const workspaceConnection =
+          workspaceProviderStatusById.get(provider.provider) ??
+          summarizeWorkspaceConnections(
+            provider.provider,
+            workspace.connections,
+            workspace.grants,
+          );
         return {
           provider: provider.provider,
           label: provider.label,
-          configured: missingRequiredKeys.length === 0,
+          configured:
+            hasRequiredCredentials ||
+            workspaceConnection.grantState === "connected",
           configuredKeys: configuredProviderKeys,
           missingRequiredKeys,
           optionalKeys,
-          workspaceConnection:
-            workspaceProviderStatusById.get(provider.provider) ??
-            summarizeWorkspaceConnections(
-              provider.provider,
-              workspace.connections,
-              workspace.grants,
-            ),
+          workspaceConnection,
         };
       });
     return {

package/corpus/templates/analytics/app/components/layout/NewAnalysisDialog.tsx

@@ -60,8 +60,8 @@ export function NewAnalysisDialog() {
   const status = statusData as DataSourceStatusResponse | undefined;
   const envStatus = credentialRowsFromStatus(status);
   const configuredSources = useMemo(
-    () => getConfiguredDataSources(envStatus),
-    [envStatus],
+    () => getConfiguredDataSources(envStatus, status),
+    [envStatus, status],
   );
   const configuredSourceNames = configuredSources.map((source) => source.name);
   const statusMessage = status?.message || status?.error;

package/corpus/templates/analytics/app/lib/data-source-status.ts

@@ -79,6 +79,10 @@ const sharedConnectionLabels: Record<SharedConnectionStatusKind, string> = {
   local_credentials: "Local credentials",
 };
 
+function normalizeCredentialKey(key: string): string {
+  return key.trim().toUpperCase();
+}
+
 export function credentialRowsFromStatus(
   data: DataSourceStatusResponse | EnvKeyStatus[] | undefined,
 ): EnvKeyStatus[] {
@@ -90,7 +94,9 @@ export function getOptionalCredentialKeys(source: DataSource): Set<string> {
   return new Set(
     source.walkthroughSteps
       .filter((step) => step.optional)
-      .map((step) => step.inputKey)
+      .map((step) =>
+        step.inputKey ? normalizeCredentialKey(step.inputKey) : undefined,
+      )
       .filter((k): k is string => Boolean(k)),
   );
 }
@@ -99,11 +105,21 @@ export function isSourceConfigured(
   source: DataSource,
   envStatus: EnvKeyStatus[],
 ): boolean {
-  const statusMap = new Map(envStatus.map((s) => [s.key, s.configured]));
+  const statusMap = new Map(
+    envStatus.map((s) => [normalizeCredentialKey(s.key), s.configured]),
+  );
   const optionalKeys = getOptionalCredentialKeys(source);
-  return source.envKeys
-    .filter((key) => !optionalKeys.has(key))
-    .every((key) => statusMap.get(key) === true);
+  const requiredKeys = source.envKeys.filter(
+    (key) => !optionalKeys.has(normalizeCredentialKey(key)),
+  );
+  if (source.credentialRequirementMode === "any") {
+    return requiredKeys.some(
+      (key) => statusMap.get(normalizeCredentialKey(key)) === true,
+    );
+  }
+  return requiredKeys.every(
+    (key) => statusMap.get(normalizeCredentialKey(key)) === true,
+  );
 }
 
 export function getWorkspaceProviderIdForSource(
@@ -132,6 +148,14 @@ export function getWorkspaceConnectionForSource(
   );
 }
 
+export function getProviderStatusForSource(
+  source: DataSource,
+  data: DataSourceStatusResponse | undefined,
+): DataSourceProviderStatus | undefined {
+  const providerId = getWorkspaceProviderIdForSource(source) ?? source.id;
+  return data?.providers?.find((provider) => provider.provider === providerId);
+}
+
 export function getSharedConnectionStatus(
   source: DataSource,
   data: DataSourceStatusResponse | undefined,
@@ -178,12 +202,29 @@ export function isSourceReady(
 ): boolean {
   return (
     isSourceConfigured(source, envStatus) ||
+    getProviderStatusForSource(source, data)?.configured === true ||
     getSharedConnectionStatus(source, data, envStatus)?.kind === "ready"
   );
 }
 
+export function isSourceLocallyConfigured(
+  source: DataSource,
+  data: DataSourceStatusResponse | undefined,
+  envStatus: EnvKeyStatus[],
+): boolean {
+  if (isSourceConfigured(source, envStatus)) return true;
+  const providerStatus = getProviderStatusForSource(source, data);
+  if (!providerStatus?.configured) return false;
+  return providerStatus.configuredKeys.length > 0;
+}
+
 export function getConfiguredDataSources(
   envStatus: EnvKeyStatus[],
+  data?: DataSourceStatusResponse,
 ): DataSource[] {
-  return dataSources.filter((source) => isSourceConfigured(source, envStatus));
+  return dataSources.filter((source) =>
+    data
+      ? isSourceReady(source, data, envStatus)
+      : isSourceConfigured(source, envStatus),
+  );
 }

package/corpus/templates/analytics/app/lib/data-sources.ts

@@ -52,6 +52,7 @@ export interface DataSource {
   category: DataSourceCategory;
   icon: ComponentType<Record<string, unknown>>;
   envKeys: string[];
+  credentialRequirementMode?: "all" | "any";
   walkthroughSteps: WalkthroughStep[];
   docsUrl: string;
 }
@@ -380,7 +381,8 @@ export const dataSources: DataSource[] = [
     description: "CRM deals, contacts, companies, tickets, and pipelines",
     category: "crm",
     icon: IconShoppingCart,
-    envKeys: ["HUBSPOT_ACCESS_TOKEN"],
+    envKeys: ["HUBSPOT_PRIVATE_APP_TOKEN", "HUBSPOT_ACCESS_TOKEN"],
+    credentialRequirementMode: "any",
     docsUrl: "https://developers.hubspot.com/docs/api/overview",
     walkthroughSteps: [
       {
@@ -391,10 +393,19 @@ export const dataSources: DataSource[] = [
         linkText: "Private Apps",
       },
       {
-        title: "Enter your Access Token",
+        title: "Enter your Private App Token",
         description: "Copy the access token from your private app.",
+        inputKey: "HUBSPOT_PRIVATE_APP_TOKEN",
+        inputLabel: "Private App Token",
+        inputPlaceholder: "pat-na1-...",
+        inputType: "password",
+      },
+      {
+        title: "Legacy access token",
+        description:
+          "Only use this if you already have an older HubSpot access token saved under the legacy key.",
         inputKey: "HUBSPOT_ACCESS_TOKEN",
-        inputLabel: "Access Token",
+        inputLabel: "Legacy Access Token",
         inputPlaceholder: "pat-na1-...",
         inputType: "password",
       },

package/corpus/templates/analytics/app/pages/DataSources.tsx

@@ -66,7 +66,7 @@ import {
   getOptionalCredentialKeys,
   getSharedConnectionStatus,
   isSourceReady,
-  isSourceConfigured,
+  isSourceLocallyConfigured,
   credentialRowsFromStatus,
   type DataSourceStatusResponse,
   type EnvKeyStatus,
@@ -674,6 +674,13 @@ function ConnectedView({
     ),
   );
   const optionalKeys = getOptionalCredentialKeys(source);
+  const isAnyCredentialMode = source.credentialRequirementMode === "any";
+  const configuredCredentialKeys = new Set(
+    envStatus.filter((s) => s.configured).map((s) => s.key),
+  );
+  const hasAlternativeCredential =
+    isAnyCredentialMode &&
+    source.envKeys.some((key) => configuredCredentialKeys.has(key));
 
   const handleDisconnect = () => {
     if (sharedCredentialKeys.length > 0) {
@@ -852,8 +859,7 @@ function ConnectedView({
         <div className="flex items-start justify-between gap-4">
           <div className="flex-1 space-y-2">
             {source.envKeys.map((key) => {
-              const configured =
-                envStatus.find((s) => s.key === key)?.configured ?? false;
+              const configured = configuredCredentialKeys.has(key);
               const optional = optionalKeys.has(key);
               return (
                 <div
@@ -873,6 +879,11 @@ function ConnectedView({
                       <IconCircle className="h-3 w-3" />
                       {t("dataSources.optional")}
                     </span>
+                  ) : hasAlternativeCredential ? (
+                    <span className="flex items-center gap-1 whitespace-nowrap text-muted-foreground">
+                      <IconCircle className="h-3 w-3" />
+                      Alternative
+                    </span>
                   ) : (
                     <span className="flex items-center gap-1 whitespace-nowrap text-rose-400">
                       <IconAlertCircle className="h-3 w-3" />
@@ -1643,7 +1654,11 @@ export default function DataSources() {
               <DataSourceCard
                 key={source.id}
                 source={source}
-                locallyConfigured={isSourceConfigured(source, envStatus)}
+                locallyConfigured={isSourceLocallyConfigured(
+                  source,
+                  statusData,
+                  envStatus,
+                )}
                 ready={isSourceReady(source, statusData, envStatus)}
                 sharedConnectionStatus={getSharedConnectionStatus(
                   source,
@@ -1676,7 +1691,11 @@ export default function DataSources() {
                   <DataSourceCard
                     key={source.id}
                     source={source}
-                    locallyConfigured={isSourceConfigured(source, envStatus)}
+                    locallyConfigured={isSourceLocallyConfigured(
+                      source,
+                      statusData,
+                      envStatus,
+                    )}
                     ready={isSourceReady(source, statusData, envStatus)}
                     sharedConnectionStatus={getSharedConnectionStatus(
                       source,

package/corpus/templates/analytics/app/pages/adhoc/sql-dashboard/PanelEditorDialog.tsx

@@ -1,9 +1,9 @@
-import { useSendToAgentChat, useT } from "@agent-native/core/client";
 import {
-  IconAlertTriangle,
-  IconAlignLeft,
-  IconLoader2,
-} from "@tabler/icons-react";
+  PromptComposer,
+  useSendToAgentChat,
+  useT,
+} from "@agent-native/core/client";
+import { IconAlertTriangle, IconAlignLeft } from "@tabler/icons-react";
 import { useEffect, useState, type ReactElement, type ReactNode } from "react";
 import { toast } from "sonner";
 
@@ -30,7 +30,6 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Textarea } from "@/components/ui/textarea";
 import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
 import { canFormatPanelSql, formatPanelSql } from "@/lib/format-sql";
 
@@ -182,7 +181,6 @@ function PanelEditorContent({
   const [form, setForm] = useState<PanelFormValues>(() => panelToForm(panel));
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);
-  const [prompt, setPrompt] = useState("");
   const [tab, setTab] = useState<"describe" | "manual">("describe");
   const { send, isGenerating } = useSendToAgentChat();
 
@@ -192,7 +190,6 @@ function PanelEditorContent({
       setForm(panelToForm(panel));
       setError(null);
       setSaving(false);
-      setPrompt("");
       // Editing an existing panel always goes straight to the manual form.
       setTab(panel ? "manual" : "describe");
     }
@@ -200,7 +197,6 @@ function PanelEditorContent({
 
   const isEdit = !!panel;
   const canSave = form.title.trim().length > 0 && form.sql.trim().length > 0;
-  const canGenerate = prompt.trim().length > 0 && !isGenerating;
   const canFormat = canFormatPanelSql(form.source);
 
   const handleSubmit = async () => {
@@ -219,13 +215,14 @@ function PanelEditorContent({
     }
   };
 
-  const handleDescribe = () => {
-    if (!canGenerate) return;
+  const handleDescribe = (text: string) => {
+    const trimmed = text.trim();
+    if (!trimmed || isGenerating) return;
     const titlesLine = existingPanelTitles.length
       ? `Existing panels on this dashboard: ${existingPanelTitles.join(", ")}.`
       : "This dashboard has no panels yet.";
     send({
-      message: prompt.trim(),
+      message: trimmed,
       context:
         `The user wants to add a new panel to SQL dashboard "${dashboardId}". ${titlesLine} ` +
         `REAL_DATA_REQUIRED: before saving or answering, run at least one real data-source query action for this panel; \`data-source-status\`, \`list-data-dictionary\`, \`update-dashboard\`, and dry-run validation do not count as data queries. ` +
@@ -246,7 +243,6 @@ function PanelEditorContent({
         `After the panel saves, call \`refresh-screen\` so the UI picks up the change.`,
       submit: true,
     });
-    setPrompt("");
     onOpenChange(false);
   };
 
@@ -441,28 +437,14 @@ function PanelEditorContent({
 
       <TabsContent value="describe" className="mt-4">
         <div className="grid gap-3">
-          <Label htmlFor="panel-prompt">{t("panelEditor.whatToChart")}</Label>
-          <Textarea
-            id="panel-prompt"
-            value={prompt}
-            onChange={(e) => setPrompt(e.target.value)}
-            placeholder={t("panelEditor.promptPlaceholder")}
-            className="min-h-[140px] resize-y text-sm"
+          <Label>{t("panelEditor.whatToChart")}</Label>
+          <PromptComposer
             autoFocus
-            onKeyDown={(e) => {
-              if ((e.metaKey || e.ctrlKey) && e.key === "Enter") {
-                e.preventDefault();
-                handleDescribe();
-              }
-            }}
+            disabled={isGenerating}
+            placeholder={t("panelEditor.promptPlaceholder")}
+            draftScope="analytics:add-panel"
+            onSubmit={handleDescribe}
           />
-          <p className="text-xs text-muted-foreground">
-            {t("panelEditor.describeHelp", {
-              shortcut: `${
-                /Mac|iPhone|iPad/.test(navigator.userAgent) ? "⌘" : "Ctrl"
-              }+Enter`,
-            })}
-          </p>
         </div>
         <EditorFooter className="mt-4">
           <Button
@@ -473,16 +455,6 @@ function PanelEditorContent({
           >
             {t("panelEditor.cancel")}
           </Button>
-          <Button size="sm" onClick={handleDescribe} disabled={!canGenerate}>
-            {isGenerating ? (
-              <>
-                <IconLoader2 className="h-3.5 w-3.5 mr-1.5 animate-spin" />
-                {t("panelEditor.generating")}
-              </>
-            ) : (
-              t("panelEditor.generate")
-            )}
-          </Button>
         </EditorFooter>
       </TabsContent>
 

package/corpus/templates/analytics/changelog/2026-06-25-fixed-hubspot-data-source-status-so-private-app-tokens-legac.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-25
+---
+
+Fixed HubSpot data source status so private app tokens, legacy tokens, and shared workspace grants show as ready consistently.

package/corpus/templates/analytics/netlify.toml

@@ -5,6 +5,7 @@ publish = "templates/analytics/dist"
 functions = "templates/analytics/.netlify/functions-internal"
 
 [build.environment]
+GA_MEASUREMENT_ID = "G-ESF7FYXGN9"
 NITRO_PRESET = "netlify"
 NPM_CONFIG_PRODUCTION = "false"
 AGENT_PROD_CODE_EXECUTION = "sandboxed"

package/corpus/templates/analytics/server/lib/credential-keys.ts

@@ -8,6 +8,7 @@ export interface CredentialProviderConfig {
   provider: string;
   label: string;
   requiredKeys: string[];
+  requiredMode?: "all" | "any";
   optionalKeys?: string[];
 }
 
@@ -217,7 +218,8 @@ export const credentialProviderConfigs: CredentialProviderConfig[] = [
   {
     provider: "hubspot",
     label: "HubSpot",
-    requiredKeys: ["HUBSPOT_ACCESS_TOKEN"],
+    requiredKeys: ["HUBSPOT_PRIVATE_APP_TOKEN", "HUBSPOT_ACCESS_TOKEN"],
+    requiredMode: "any",
   },
   {
     provider: "gong",

package/corpus/templates/analytics/server/routes/api/test-connection.post.ts

@@ -5,7 +5,11 @@ import {
   resolveCredential,
   withRequestContextFromEvent,
 } from "../../lib/credentials";
-import { resolveAnalyticsGongCredentials } from "../../lib/provider-credentials";
+import {
+  HUBSPOT_ANALYTICS_CREDENTIAL_KEYS,
+  resolveAnalyticsGongCredentials,
+  resolveAnalyticsProviderCredential,
+} from "../../lib/provider-credentials";
 
 export default defineEventHandler(async (event) => {
   const body = await readBody(event);
@@ -91,8 +95,13 @@ export default defineEventHandler(async (event) => {
         }
 
         case "hubspot": {
-          const token = await resolveCredential("HUBSPOT_ACCESS_TOKEN", ctx);
-          if (!token) return { ok: false, error: "Missing access token" };
+          const credential = await resolveAnalyticsProviderCredential({
+            provider: "hubspot",
+            keys: HUBSPOT_ANALYTICS_CREDENTIAL_KEYS,
+            ctx,
+          });
+          const token = credential?.value;
+          if (!token) return { ok: false, error: "Missing HubSpot token" };
           const res = await fetch(
             "https://api.hubapi.com/crm/v3/objects/contacts?limit=1",
             {

package/corpus/templates/assets/app/components/layout/Sidebar.tsx

@@ -2,6 +2,7 @@ import {
   DevDatabaseLink,
   FeedbackButton,
   appPath,
+  focusAgentChat,
   navigateWithAgentChatViewTransition,
   useActionQuery,
   useChatThreads,
@@ -507,14 +508,16 @@ export function Sidebar() {
                 onClick={(event) => {
                   if (
                     item.href === "/" &&
-                    !isCreateRoute &&
                     !event.metaKey &&
                     !event.ctrlKey &&
                     !event.shiftKey &&
                     !event.altKey
                   ) {
                     event.preventDefault();
-                    navigateWithAgentChatViewTransition(navigate, "/");
+                    focusAgentChat();
+                    if (!isCreateRoute || location.pathname !== "/") {
+                      navigateWithAgentChatViewTransition(navigate, "/");
+                    }
                   }
                 }}
                 className={cn(