@agent-native/core 0.101.4 → 0.101.6

package/corpus/templates/analytics/server/lib/real-data-actions.ts

@@ -175,7 +175,7 @@ function looksLikeWorkflowOrAutomationRequest(lower: string): boolean {
 }
 
 const ANALYTICS_RESULT_TERMS =
-  /\b(conversion|conversions|funnel|revenue|traffic|pageviews?|signups?|events?|active users?|sessions?|retention|churn|pipeline|deals?|calls?|transcripts?|sentiment|themes?|objections?|cohorts?|segments?|accounts?|customers?|tickets?|issues?|leads?|opportunities|mrr|arr|ctr|cvr|cac|ltv)\b/;
+  /\b(conversion|conversions|funnel|revenue|payment|payments|traffic|pageviews?|signups?|events?|active users?|sessions?|retention|churn|pipeline|deals?|calls?|transcripts?|sentiment|themes?|objections?|cohorts?|segments?|accounts?|customers?|tickets?|issues?|leads?|opportunities|mrr|arr|ctr|cvr|cac|ltv)\b/;
 
 const ANALYTICS_INTENT_TERMS =
   /\b(analy[sz]e|measure|calculate|query|report|summari[sz]e|break ?down|compare|rank|segment|forecast|trend|count|total|average|median|percent(?:age)?|rate|top|bottom|highest|lowest|how many|how much|what (?:is|are|was|were)|which|why)\b/;
@@ -183,6 +183,11 @@ const ANALYTICS_INTENT_TERMS =
 const SOURCE_SEARCH_INTENT_TERMS =
   /\b(find|surface|search|scan|grep|review|inspect|check|look through|go find)\b/;
 
+const SETUP_REQUEST_TERMS =
+  /\b(connect|configure|configuration|settings?|setup|set up|credentials?|authenticate|authorization)\b/;
+const SETUP_REQUEST_FRAMING =
+  /\b(?:how (?:do|can) i|can you|help me|where can i|show me how)\b/;
+
 const ARTIFACT_TERMS = /\b(analysis|dashboard|panel|chart|metric|metrics)\b/;
 
 const ARTIFACT_DATA_INTENT =
@@ -199,6 +204,12 @@ export function looksLikeAnalyticsDataRequest(text: string): boolean {
   const lower = requestText.toLowerCase();
   if (!lower) return false;
   if (lower.includes(REAL_DATA_REQUIRED_MARKER.toLowerCase())) return true;
+  if (
+    SETUP_REQUEST_TERMS.test(lower) &&
+    (SETUP_REQUEST_FRAMING.test(lower) || /\bsettings?\b/.test(lower))
+  ) {
+    return false;
+  }
   if (looksLikeWorkflowOrAutomationRequest(lower)) return false;
   if (
     /\b(open|navigate|go to|rename|delete|share|favorite|unfavorite)\b/.test(
@@ -216,7 +227,8 @@ export function looksLikeAnalyticsDataRequest(text: string): boolean {
   }
   if (
     /\b(integration|connect|configure|settings)\b/.test(lower) &&
-    !ANALYTICS_RESULT_TERMS.test(lower)
+    !ANALYTICS_INTENT_TERMS.test(lower) &&
+    !SOURCE_SEARCH_INTENT_TERMS.test(lower)
   ) {
     return false;
   }
@@ -263,7 +275,7 @@ export function isGenericNoDataFallback(text: string): boolean {
 }
 
 const SAFE_NO_DATA_RESPONSE =
-  /\b(?:i can't|i cannot|can't retrieve|cannot retrieve|couldn't retrieve|unable to retrieve|don't have access|do not have access|not configured|missing credentials?|need (?:a|the)? ?data source|need to know which source|which source|which data source|clarify|can you|once (?:that'?s|it is) (?:connected|configured|available)|no data source|without a successful|query failed|source query failed|sql failed|error running|before (?:i|we) can (?:calculate|report|answer|analyze)|i need to query)\b/i;
+  /\b(?:i can't|i cannot|can't retrieve|cannot retrieve|couldn't retrieve|unable to retrieve|don't have access|do not have access|not configured|not connected|missing credentials?|need (?:a|the)? ?data source|need to know which source|which source|which data source|clarify|can you|once (?:that'?s|it is) (?:connected|configured|available)|no data source|without a successful|query failed|source query failed|sql failed|error running|before (?:i|we) can (?:calculate|report|answer|analyze)|i need to query)\b/i;
 
 export function isSafeNoDataAnalyticsResponse(text: string): boolean {
   const trimmed = text.trim();

package/corpus/templates/analytics/server/plugins/agent-chat.ts

@@ -1,6 +1,7 @@
 import { getOrgContext } from "@agent-native/core/org";
 import {
   createAgentChatPlugin,
+  buildDeepLink,
   loadActionsFromStaticRegistry,
   type AgentLoopFinalResponseGuardContext,
 } from "@agent-native/core/server";
@@ -11,9 +12,9 @@ import {
   INITIAL_TOOL_NAMES,
 } from "../lib/agent-chat-plan-mode";
 import { ANALYTICS_CONNECTOR_CATALOG } from "../lib/analytics-connector-catalog";
+import { credentialProviderConfigs } from "../lib/credential-keys";
 import {
   failedDataQueryAttemptMessage,
-  GENERIC_NO_DATA_FALLBACK_MESSAGE,
   hasExplicitPartialDisclosure,
   hasFailedCorpusWorkflowEvidence,
   hasDataQueryAttempt,
@@ -30,6 +31,12 @@ import {
 
 const ANALYTICS_BACKGROUND_RUN_SOFT_TIMEOUT_MS = 13 * 60_000;
 
+const ANALYTICS_DATA_SOURCES_LINK = buildDeepLink({
+  app: "analytics",
+  view: "data-sources",
+  to: "/data-sources",
+});
+
 export const SIMPLE_TIME_BOUNDED_METRIC_FAST_PATH_GUIDANCE =
   "SIMPLE TIME-BOUNDED METRIC FAST PATH — When the data dictionary or a known canonical source identifies the metric, run one bounded aggregate. Once it returns a valid result, answer the explicit question immediately with the source, time window, row count, and only necessary caveats. Do not schema-discover, retry, enrich, cross-check, or add breakdowns after that successful result unless the query failed or the result conflicts with the known metric definition. This does not waive the real-data requirement: never answer from a guess, stale value, or unverified result. ";
 
@@ -62,6 +69,7 @@ export function analyticsSourceGuidanceOpening(): string {
     SIMPLE_TIME_BOUNDED_METRIC_FAST_PATH_GUIDANCE +
     BUILT_IN_FIRST_PARTY_SOURCE_GUIDANCE +
     ANALYTICS_OBSERVABILITY_INCIDENT_GUIDANCE +
+    `DATA-SOURCE SETUP UX — Chat remains available when no external data source is connected. For a live-data request that needs an unavailable external provider, explain what is missing in the context of the user's question and guide them naturally to [Connect data sources](${ANALYTICS_DATA_SOURCES_LINK}). Use that real link from the app; do not emit a generic canned no-data sentence. For general conversation, conceptual questions, and questions the built-in first-party source can answer, continue helping normally. ` +
     "SURFACE DIFFERENTIATION — You are the analytics assistant for definitions, deep-dive analysis, and action. For questions about what a metric, model, or table means, use the Data Dictionary and configured schema tools first. For trends, comparisons, anomalies, current data, or anything that requires querying live data, answer directly in chat with the relevant provider query, dashboard analysis, and inline charts when useful. "
   );
 }
@@ -145,6 +153,279 @@ function configuredDataSourceLabels(
   return [...labels];
 }
 
+interface DataSourceStatusSummary {
+  checked: boolean;
+  externalSourceLabels: string[];
+  availableExternalSources: Array<{
+    aliases: string[];
+    configured: boolean;
+  }>;
+  setupLink: string;
+}
+
+const GENERIC_EXTERNAL_SOURCE_REQUEST_TERMS = /\b(warehouse|crm|payments?)\b/i;
+
+const EXTERNAL_SOURCE_PROVIDER_ALIASES = [
+  ...credentialProviderConfigs.map(({ provider, label }) => ({
+    terms: [provider, label],
+    aliases: [provider, label],
+  })),
+  { terms: ["ga4"], aliases: ["ga4", "google analytics"] },
+  { terms: ["twitter/x", "x/twitter"], aliases: ["twitter", "x/twitter"] },
+];
+
+function looksLikeExternalSourceRequest(userText: string): boolean {
+  return (
+    GENERIC_EXTERNAL_SOURCE_REQUEST_TERMS.test(userText) ||
+    EXTERNAL_SOURCE_PROVIDER_ALIASES.some(({ terms }) =>
+      terms.some((term) => containsNormalizedPhrase(userText, term)),
+    )
+  );
+}
+
+function normalizeSourceLabel(value: string): string {
+  return value
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, " ")
+    .trim();
+}
+
+function containsNormalizedPhrase(text: string, phrase: string): boolean {
+  const normalizedText = normalizeSourceLabel(text);
+  const normalizedPhrase = normalizeSourceLabel(phrase);
+  return Boolean(
+    normalizedPhrase &&
+    (normalizedText === normalizedPhrase ||
+      normalizedText.startsWith(`${normalizedPhrase} `) ||
+      normalizedText.endsWith(` ${normalizedPhrase}`) ||
+      normalizedText.includes(` ${normalizedPhrase} `)),
+  );
+}
+
+function sourceAliasesOverlap(left: string[], right: string[]): boolean {
+  return left.some((leftAlias) =>
+    right.some((rightAlias) => {
+      const normalizedLeft = normalizeSourceLabel(leftAlias);
+      const normalizedRight = normalizeSourceLabel(rightAlias);
+      return (
+        normalizedLeft === normalizedRight ||
+        normalizedLeft.startsWith(`${normalizedRight} `) ||
+        normalizedLeft.endsWith(` ${normalizedRight}`) ||
+        normalizedLeft.includes(` ${normalizedRight} `) ||
+        normalizedRight.startsWith(`${normalizedLeft} `) ||
+        normalizedRight.endsWith(` ${normalizedLeft}`) ||
+        normalizedRight.includes(` ${normalizedLeft} `)
+      );
+    }),
+  );
+}
+
+function hasMissingRequestedExternalSource(
+  userText: string,
+  configuredSourceLabels: string[],
+  availableExternalSources: DataSourceStatusSummary["availableExternalSources"] = [],
+): boolean {
+  const configuredAliases = [
+    ...configuredSourceLabels.map((label) => [label]),
+    ...availableExternalSources
+      .filter(({ configured }) => configured)
+      .map(({ aliases }) => aliases),
+  ];
+  const sourceAliases = [
+    ...EXTERNAL_SOURCE_PROVIDER_ALIASES,
+    ...availableExternalSources.map(({ aliases }) => ({
+      terms: aliases,
+      aliases,
+    })),
+  ];
+  return sourceAliases
+    .filter(({ terms }) =>
+      terms.some((term) => containsNormalizedPhrase(userText, term)),
+    )
+    .some(
+      ({ aliases }) =>
+        !configuredAliases.some((configured) =>
+          sourceAliasesOverlap(configured, aliases),
+        ),
+    );
+}
+
+function dataSourceStatusSummary(
+  toolResults: AgentLoopFinalResponseGuardContext["toolResults"],
+): DataSourceStatusSummary {
+  const externalSourceLabels = new Set<string>();
+  const availableExternalSources = new Map<
+    string,
+    { aliases: string[]; configured: boolean }
+  >();
+  let checked = false;
+  let setupLink = ANALYTICS_DATA_SOURCES_LINK;
+
+  const addAvailableExternalSource = (
+    provider: unknown,
+    label: unknown,
+    configured: boolean,
+  ) => {
+    const aliases = [provider, label]
+      .filter((value): value is string => typeof value === "string")
+      .map((value) => value.trim())
+      .filter(Boolean);
+    const key = normalizeSourceLabel(aliases[0] ?? aliases[1] ?? "");
+    if (!key) return;
+    const existing = availableExternalSources.get(key);
+    if (existing) {
+      existing.configured ||= configured;
+      existing.aliases = [...new Set([...existing.aliases, ...aliases])];
+      return;
+    }
+    availableExternalSources.set(key, { aliases, configured });
+  };
+
+  for (const result of toolResults ?? []) {
+    const normalizedName = String(result.name ?? "")
+      .trim()
+      .toLowerCase()
+      .replace(/[\s_]+/g, "-");
+    if (normalizedName !== "data-source-status" || result.isError) continue;
+
+    checked = true;
+    let parsed: Record<string, unknown>;
+    try {
+      const value = JSON.parse(String(result.content ?? ""));
+      if (!value || typeof value !== "object" || Array.isArray(value)) {
+        continue;
+      }
+      parsed = value as Record<string, unknown>;
+    } catch {
+      continue;
+    }
+
+    let foundSetupLink = false;
+    for (const candidate of [
+      parsed.dataSourcesSetupLink,
+      parsed.dataSourcesLink,
+      parsed.setupLink,
+    ]) {
+      const url =
+        typeof candidate === "string"
+          ? candidate
+          : candidate &&
+              typeof candidate === "object" &&
+              !Array.isArray(candidate)
+            ? (candidate as Record<string, unknown>).url
+            : undefined;
+      if (typeof url === "string" && url.trim()) {
+        setupLink = url.trim();
+        foundSetupLink = true;
+        break;
+      }
+    }
+    if (
+      !foundSetupLink &&
+      typeof parsed.settingsPath === "string" &&
+      parsed.settingsPath.trim()
+    ) {
+      setupLink = parsed.settingsPath.trim();
+    }
+
+    const compactSources = Array.isArray(parsed.configuredDataSources)
+      ? parsed.configuredDataSources
+      : [];
+    for (const source of compactSources) {
+      if (!source || typeof source !== "object" || Array.isArray(source)) {
+        continue;
+      }
+      const record = source as Record<string, unknown>;
+      const provider = String(record.provider ?? "")
+        .trim()
+        .toLowerCase();
+      const via = String(record.via ?? "")
+        .trim()
+        .toLowerCase();
+      if (provider === "first-party" || via === "built-in") continue;
+      const label = record.label ?? record.provider;
+      if (typeof label === "string" && label.trim()) {
+        externalSourceLabels.add(label.trim());
+      }
+      addAvailableExternalSource(record.provider, label, true);
+    }
+
+    // Backward compatibility for status responses that predate the compact
+    // configuredDataSources summary.
+    const providers = Array.isArray(parsed.providers) ? parsed.providers : [];
+    for (const provider of providers) {
+      if (
+        !provider ||
+        typeof provider !== "object" ||
+        Array.isArray(provider)
+      ) {
+        continue;
+      }
+      const record = provider as Record<string, unknown>;
+      const providerId = String(record.provider ?? "")
+        .trim()
+        .toLowerCase();
+      if (providerId === "first-party") continue;
+      const label = record.label ?? record.provider;
+      addAvailableExternalSource(
+        record.provider,
+        label,
+        record.configured === true,
+      );
+      if (record.configured !== true) continue;
+      if (typeof label === "string" && label.trim()) {
+        externalSourceLabels.add(label.trim());
+      }
+    }
+
+    const workspaceConnections =
+      parsed.workspaceConnections &&
+      typeof parsed.workspaceConnections === "object" &&
+      !Array.isArray(parsed.workspaceConnections)
+        ? (parsed.workspaceConnections as Record<string, unknown>)
+        : null;
+    const workspaceProviders = Array.isArray(workspaceConnections?.providers)
+      ? workspaceConnections.providers
+      : [];
+    for (const provider of workspaceProviders) {
+      if (
+        !provider ||
+        typeof provider !== "object" ||
+        Array.isArray(provider)
+      ) {
+        continue;
+      }
+      const record = provider as Record<string, unknown>;
+      const providerId = record.id ?? record.provider;
+      const label = record.label ?? providerId;
+      const configured =
+        record.configured === true || record.grantState === "connected";
+      addAvailableExternalSource(providerId, label, configured);
+      if (configured && typeof label === "string" && label.trim()) {
+        externalSourceLabels.add(label.trim());
+      }
+    }
+  }
+
+  return {
+    checked,
+    externalSourceLabels: [...externalSourceLabels],
+    availableExternalSources: [...availableExternalSources.values()],
+    setupLink,
+  };
+}
+
+function includesDataSourcesLink(text: string, setupLink: string): boolean {
+  const normalizedSetupLink = setupLink.trim().replace(/&amp;/g, "&");
+  if (!normalizedSetupLink) return false;
+  const normalizedText = text.replace(/&amp;/g, "&");
+  const linkPattern = /\[[^\]]+\]\((<[^>]+>|[^\s)]+)(?:\s+["'][^)]*["'])?\)/g;
+  return [...normalizedText.matchAll(linkPattern)].some((match) => {
+    const destination = match[1]?.replace(/^<|>$/g, "");
+    return destination === normalizedSetupLink;
+  });
+}
+
 export function realDataFinalGuard(
   context: AgentLoopFinalResponseGuardContext,
 ) {
@@ -172,6 +453,22 @@ export function realDataFinalGuard(
     return null;
   }
   const incompleteEvidence = hasIncompleteDataEvidence(context.toolResults);
+  const dataQueryAttempted = hasDataQueryAttempt(context.toolResults);
+  const sourceStatus = dataSourceStatusSummary(context.toolResults);
+  const noConnectedExternalSources =
+    sourceStatus.checked && sourceStatus.externalSourceLabels.length === 0;
+  const externalSourceRequest = looksLikeExternalSourceRequest(userText);
+  const missingRequestedExternalSource = hasMissingRequestedExternalSource(
+    userText,
+    sourceStatus.externalSourceLabels,
+    sourceStatus.availableExternalSources,
+  );
+  const firstPartySourceShouldBeTried =
+    noConnectedExternalSources && !externalSourceRequest;
+  const needsDataSourceLink =
+    !sourceStatus.checked ||
+    (externalSourceRequest &&
+      (noConnectedExternalSources || missingRequestedExternalSource));
   if (
     hasFailedCorpusWorkflowEvidence(context.toolResults) &&
     looksLikeCoverageSensitiveAnalyticsRequest(userText) &&
@@ -225,17 +522,80 @@ export function realDataFinalGuard(
         "I can't make a confident exhaustive analytics claim yet because part of the source evidence was aborted, truncated, or still paginated. I need to recover the missing coverage or state the answer as partial with the inspected sample size.",
     };
   }
-  if (hasDataQueryAttempt(context.toolResults)) return null;
-  if (isSafeNoDataAnalyticsResponse(context.text)) return null;
+  if (dataQueryAttempted) return null;
+  if (isSafeNoDataAnalyticsResponse(context.text)) {
+    if (firstPartySourceShouldBeTried) {
+      return {
+        retryMessage:
+          "The built-in first-party Analytics source is available even though no external provider is connected. Use `query-agent-native-analytics` for the user's first-party product, usage, conversion, or observability question before explaining that data is unavailable. Only guide the user to connect a source if the request specifically needs an external provider.",
+        fallbackMessage:
+          "I couldn't complete a grounded first-party Analytics query yet. Please retry and I'll use the built-in Analytics source before asking you to connect an external provider.",
+        maxRetries: 2,
+        expandToolSurface: true,
+      };
+    }
+    if (
+      needsDataSourceLink &&
+      !includesDataSourcesLink(context.text, sourceStatus.setupLink)
+    ) {
+      return {
+        retryMessage: `The response correctly explains that the requested live data is unavailable, but it needs a contextual next step. Explain which external source is missing, keep the conversation open, and include this exact markdown link: [Connect data sources](${sourceStatus.setupLink}). Do not use the generic no-grounded-data fallback.`,
+        fallbackMessage: `I can help with that once the relevant source is connected. [Connect data sources](${sourceStatus.setupLink})`,
+        maxRetries: 2,
+      };
+    }
+    return null;
+  }
   const failedQueryMessage = failedDataQueryAttemptMessage(context.toolResults);
   if (failedQueryMessage) {
+    if (
+      needsDataSourceLink &&
+      !includesDataSourcesLink(context.text, sourceStatus.setupLink)
+    ) {
+      return {
+        retryMessage: `${failedQueryMessage} Explain which external source is missing and include this exact markdown link: [Connect data sources](${sourceStatus.setupLink}).`,
+        fallbackMessage: `${failedQueryMessage} [Connect data sources](${sourceStatus.setupLink})`,
+        maxRetries: 2,
+      };
+    }
     return {
       retryMessage: failedQueryMessage,
       fallbackMessage: failedQueryMessage,
     };
   }
 
+  if (
+    needsDataSourceLink &&
+    (missingRequestedExternalSource ||
+      (noConnectedExternalSources && externalSourceRequest))
+  ) {
+    return {
+      retryMessage: `The requested external source is not connected. Explain what is missing in the context of the user's question and include this exact markdown link: [Connect data sources](${sourceStatus.setupLink}). Do not use the generic no-grounded-data fallback.`,
+      fallbackMessage: `I can help with that once the relevant source is connected. [Connect data sources](${sourceStatus.setupLink})`,
+      maxRetries: 2,
+      expandToolSurface: true,
+    };
+  }
+
   const configuredSources = configuredDataSourceLabels(context.toolResults);
+  if (firstPartySourceShouldBeTried) {
+    return {
+      retryMessage:
+        "The user asked for live analytics, and the built-in first-party Analytics source is available even though no external provider is connected. Call `query-agent-native-analytics` for first-party product, usage, conversion, or observability data and answer from that result. If the request specifically names an external provider, explain what is missing and include the real Connect data sources link.",
+      fallbackMessage:
+        "I couldn't complete a grounded first-party Analytics query yet. Please retry and I'll use the built-in Analytics source before asking you to connect an external provider.",
+      maxRetries: 2,
+      expandToolSurface: true,
+    };
+  }
+  if (noConnectedExternalSources) {
+    return {
+      retryMessage: `The user asked for live analytics, but data-source-status found no connected external providers. The built-in first-party source is still available for first-party Analytics data. If this request needs an external source, respond naturally in the context of the user's question, explain what is missing, and include [Connect data sources](${sourceStatus.setupLink}). Do not use a generic canned no-data response.`,
+      fallbackMessage: `I can help with that once the relevant source is connected. [Connect data sources](${sourceStatus.setupLink})`,
+      maxRetries: 2,
+      expandToolSurface: true,
+    };
+  }
   const configuredSourceGuidance = configuredSources.length
     ? ` \`data-source-status\` already confirmed these connected sources: ${configuredSources.join(", ")}. Do not claim that no sources are connected and do not ask the user to reconnect them. Immediately call the relevant query action for one of those sources.`
     : "";
@@ -246,7 +606,7 @@ export function realDataFinalGuard(
       " If the right response is a clarification, plan, or explicit unavailable/credentials-missing message with no metrics or source-record claims, finalize that directly instead.",
     fallbackMessage: configuredSources.length
       ? `I found connected data sources (${configuredSources.join(", ")}), but the model still did not run a real source query. Please retry the request; you do not need to reconnect those sources.`
-      : GENERIC_NO_DATA_FALLBACK_MESSAGE,
+      : `I couldn't complete a grounded answer to that request. If the relevant provider isn't connected, [connect data sources](${ANALYTICS_DATA_SOURCES_LINK}) and I'll try again with real data.`,
     // Some models use separate turns for status, schema discovery, and the
     // actual query. One corrective turn was enough for Sonnet but caused Luna
     // to hit the fallback before it reached the query.

package/corpus/templates/clips/app/components/dictate/vocabulary-section.tsx

@@ -66,6 +66,7 @@ export function VocabularySection() {
   const removeTerm = useActionMutation<unknown, { id: string }>(
     "remove-vocabulary-term",
     {
+      method: "DELETE",
       onMutate: async (vars) => {
         await queryClient.cancelQueries({ queryKey: QUERY_KEY });
         const prev = queryClient.getQueryData(QUERY_KEY);

package/corpus/templates/clips/app/components/library/folder-tree.tsx

@@ -182,23 +182,29 @@ function FolderItem({
                 ) : (
                   <IconFolder className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
                 )}
-                <span className="truncate">{node.name}</span>
+                <span className="truncate" title={node.name}>
+                  {node.name}
+                </span>
               </NavLink>
             </div>
           </ContextMenuTrigger>
           <ContextMenuContent>
             <ContextMenuItem
               onSelect={() => {
-                setRenameValue(node.name);
-                setRenameOpen(true);
+                setTimeout(() => {
+                  setRenameValue(node.name);
+                  setRenameOpen(true);
+                }, 0);
               }}
             >
               <IconEdit className="h-3.5 w-3.5 me-2" /> {t("folderTree.rename")}
             </ContextMenuItem>
             <ContextMenuItem
               onSelect={() => {
-                setNewValue("");
-                setNewOpen(true);
+                setTimeout(() => {
+                  setNewValue("");
+                  setNewOpen(true);
+                }, 0);
               }}
             >
               <IconFolderPlus className="h-3.5 w-3.5 me-2" />{" "}
@@ -206,7 +212,7 @@ function FolderItem({
             </ContextMenuItem>
             <ContextMenuSeparator />
             <ContextMenuItem
-              onSelect={() => setConfirmDelete(true)}
+              onSelect={() => setTimeout(() => setConfirmDelete(true), 0)}
               className="text-destructive"
             >
               <IconTrash className="h-3.5 w-3.5 me-2" />{" "}
@@ -263,7 +269,6 @@ function FolderItem({
                         ),
                     },
                   );
-                  setRenameOpen(false);
                 }}
               >
                 {t("common.save")}
@@ -311,7 +316,6 @@ function FolderItem({
                         ),
                     },
                   );
-                  setNewOpen(false);
                 }}
               >
                 {t("common.create")}
@@ -346,7 +350,6 @@ function FolderItem({
                         ),
                     },
                   );
-                  setConfirmDelete(false);
                 }}
               >
                 {t("folderTree.delete")}

package/corpus/templates/clips/app/components/library/library-layout.tsx

@@ -11,7 +11,7 @@ import { ExtensionsSidebarSection } from "@agent-native/core/client/extensions";
 import {
   InvitationBanner,
   OrgSwitcher,
-  useOrg,
+  useOrgRole,
 } from "@agent-native/core/client/org";
 import {
   IconInbox,
@@ -115,7 +115,7 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
   const { shouldShowPromo, shouldShowSidebarLink, dismiss } = useDesktopPromo();
   usePrefetchVideoStorageStatus();
 
-  const { data: org } = useOrg();
+  const { org, canManageOrg } = useOrgRole();
   const hasActiveOrg = Boolean(org?.orgId);
   const { data: organizations } = useOrganizations({ enabled: hasActiveOrg });
   const currentOrganizationId =
@@ -466,19 +466,23 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
                     <span className="text-[10px] font-semibold uppercase tracking-wide text-muted-foreground">
                       {t("navigation.spaces")}
                     </span>
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <button
-                          type="button"
-                          aria-label={t("navigation.spaces")}
-                          className="rounded p-1 text-muted-foreground hover:bg-accent"
-                          onClick={() => setNewSpaceOpen(true)}
-                        >
-                          <IconPlus className="h-3.5 w-3.5" />
-                        </button>
-                      </TooltipTrigger>
-                      <TooltipContent>{t("navigation.spaces")}</TooltipContent>
-                    </Tooltip>
+                    {canManageOrg && (
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <button
+                            type="button"
+                            aria-label={t("navigation.spaces")}
+                            className="rounded p-1 text-muted-foreground hover:bg-accent"
+                            onClick={() => setNewSpaceOpen(true)}
+                          >
+                            <IconPlus className="h-3.5 w-3.5" />
+                          </button>
+                        </TooltipTrigger>
+                        <TooltipContent>
+                          {t("navigation.spaces")}
+                        </TooltipContent>
+                      </Tooltip>
+                    )}
                   </div>
                   <ul className="space-y-0.5">
                     {(spaces?.spaces ?? []).map((s: any) => {
@@ -661,7 +665,6 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
                   },
                 );
                 setNewFolderName("");
-                setNewFolderOpen(false);
               }}
             >
               {t("common.create")}

package/corpus/templates/clips/app/routes/_app.spaces._index.tsx

@@ -1,4 +1,5 @@
 import { useT } from "@agent-native/core/client";
+import { useOrgRole } from "@agent-native/core/client/org";
 import { IconPlus, IconUsersGroup } from "@tabler/icons-react";
 import { useState } from "react";
 
@@ -29,6 +30,7 @@ function Skeleton() {
 export default function SpacesIndexRoute() {
   const t = useT();
   const [createOpen, setCreateOpen] = useState(false);
+  const { canManageOrg } = useOrgRole();
   const { data: organizations } = useOrganizations();
   const currentOrganizationId =
     organizations?.currentId ?? organizations?.organizations?.[0]?.id;
@@ -53,15 +55,17 @@ export default function SpacesIndexRoute() {
             {t("navigation.spaces")}
           </h1>
         </div>
-        <div className="ml-auto">
-          <Button
-            size="sm"
-            className="gap-1.5 bg-primary text-primary-foreground hover:bg-primary/90"
-            onClick={() => setCreateOpen(true)}
-          >
-            <IconPlus className="h-4 w-4" /> {t("createSpaceDialog.newSpace")}
-          </Button>
-        </div>
+        {canManageOrg && (
+          <div className="ml-auto">
+            <Button
+              size="sm"
+              className="gap-1.5 bg-primary text-primary-foreground hover:bg-primary/90"
+              onClick={() => setCreateOpen(true)}
+            >
+              <IconPlus className="h-4 w-4" /> {t("createSpaceDialog.newSpace")}
+            </Button>
+          </div>
+        )}
       </PageHeader>
 
       <div className="flex-1 overflow-y-auto p-5">

package/corpus/templates/clips/changelog/2026-07-15-folders-and-sidebar-links-are-clickable-again-immediately-af.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-15
+---
+
+Folders and sidebar links are clickable again immediately after creating or renaming a folder.