@arcgis/ai-components 5.1.0-next.126 → 5.1.0-next.128

package/dist/chunks/adapter.js

@@ -1,129 +1,129 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import ce from "@arcgis/core/identity/IdentityManager.js";
-import k from "@arcgis/core/portal/Portal.js";
-import { Annotation as b, messagesStateReducer as me } from "@langchain/langgraph/web";
-import { n as Ne, o as x, k as U, s as S, i as ze } from "./generateLayerDescriptions.js";
+import me from "@arcgis/core/identity/IdentityManager.js";
+import F from "@arcgis/core/portal/Portal.js";
+import { Annotation as b, messagesStateReducer as be } from "@langchain/langgraph/web";
+import { n as ze, o as x, k as B, s as v, i as qe } from "./generateLayerDescriptions.js";
 import "@langchain/core/messages";
 import "@langchain/core/callbacks/dispatch/web";
 import "@langchain/openai";
-import * as qe from "@arcgis/core/core/reactiveUtils.js";
+import * as Ae from "@arcgis/core/core/reactiveUtils.js";
 import "@arcgis/core/layers/FeatureLayer.js";
-import le from "@arcgis/core/request.js";
+import he from "@arcgis/core/request.js";
 import "@langchain/core/prompts";
-import { tool as f } from "@langchain/core/tools";
-import J from "@arcgis/core/config.js";
+import { tool as y } from "@langchain/core/tools";
+import X from "@arcgis/core/config.js";
 import De from "@arcgis/core/Graphic.js";
-import { addressToLocations as Ae } from "@arcgis/core/rest/locator.js";
-import Le from "@arcgis/core/symbols/PictureMarkerSymbol.js";
-import i, { z as C } from "zod";
-import Pe from "@arcgis/core/geometry/Extent.js";
-import ye from "@arcgis/core/geometry/Point.js";
-import { createRenderer as je } from "@arcgis/core/smartMapping/renderers/pieChart.js";
-import { getSchemesByTag as Ge, getSchemes as Oe } from "@arcgis/core/smartMapping/symbology/pieChart.js";
-import { getBackgroundColorTheme as ue } from "@arcgis/core/views/support/colorUtils.js";
-import { createAgeRenderer as Me, createContinuousRenderer as Qe } from "@arcgis/core/smartMapping/renderers/color.js";
-import { getSchemesByTag as re } from "@arcgis/core/smartMapping/symbology/color.js";
-import { createContinuousRenderer as _e } from "@arcgis/core/smartMapping/renderers/univariateColorSize.js";
-import { createRenderer as We } from "@arcgis/core/smartMapping/renderers/dotDensity.js";
-import { getSchemesByTag as Ve } from "@arcgis/core/smartMapping/symbology/dotDensity.js";
-import { createRenderer as Ue } from "@arcgis/core/smartMapping/renderers/heatmap.js";
-import { getSchemesByTag as Ke } from "@arcgis/core/smartMapping/symbology/heatmap.js";
-import { createRenderer as Be } from "@arcgis/core/smartMapping/renderers/predominance.js";
-import { getSchemesByTag as He } from "@arcgis/core/smartMapping/symbology/predominance.js";
-import { createRenderer as Je } from "@arcgis/core/smartMapping/renderers/relationship.js";
-import { getSchemesByTag as Ze } from "@arcgis/core/smartMapping/symbology/relationship.js";
-import { createAgeRenderer as Ye, createContinuousRenderer as Xe } from "@arcgis/core/smartMapping/renderers/size.js";
-import { createRenderer as et } from "@arcgis/core/smartMapping/renderers/type.js";
-import { getSchemesByTag as tt } from "@arcgis/core/smartMapping/symbology/type.js";
-import { ToolNode as rt } from "@langchain/langgraph/prebuilt";
-import ot from "@arcgis/core/layers/support/FeatureEffect.js";
-import fe from "@arcgis/core/layers/support/FeatureFilter.js";
-import * as at from "@arcgis/core/geometry/operators/unionOperator.js";
-import { formatDateOnly as nt, convertDateFormatToIntlOptions as M, formatTimeOnly as it, formatDate as de } from "@arcgis/core/intl.js";
-import st from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
-import ct from "@arcgis/core/smartMapping/statistics/uniqueValues.js";
-import lt from "@arcgis/core/rest/support/TopFeaturesQuery.js";
-import ut from "@arcgis/core/rest/support/TopFilter.js";
-import dt from "@arcgis/core/WebLinkChart.js";
-import ge from "@arcgis/core/rest/knowledgeGraph/GraphQueryStreaming.js";
+import { addressToLocations as Le } from "@arcgis/core/rest/locator.js";
+import Pe from "@arcgis/core/symbols/PictureMarkerSymbol.js";
+import i, { z as E } from "zod";
+import je from "@arcgis/core/geometry/Extent.js";
+import Te from "@arcgis/core/geometry/Point.js";
+import { createRenderer as Ge } from "@arcgis/core/smartMapping/renderers/pieChart.js";
+import { getSchemesByTag as Oe, getSchemes as Me } from "@arcgis/core/smartMapping/symbology/pieChart.js";
+import { getBackgroundColorTheme as ye } from "@arcgis/core/views/support/colorUtils.js";
+import { createAgeRenderer as Qe, createContinuousRenderer as _e } from "@arcgis/core/smartMapping/renderers/color.js";
+import { getSchemesByTag as ce } from "@arcgis/core/smartMapping/symbology/color.js";
+import { createContinuousRenderer as We } from "@arcgis/core/smartMapping/renderers/univariateColorSize.js";
+import { createRenderer as Ve } from "@arcgis/core/smartMapping/renderers/dotDensity.js";
+import { getSchemesByTag as Ue } from "@arcgis/core/smartMapping/symbology/dotDensity.js";
+import { createRenderer as Ke } from "@arcgis/core/smartMapping/renderers/heatmap.js";
+import { getSchemesByTag as Be } from "@arcgis/core/smartMapping/symbology/heatmap.js";
+import { createRenderer as He } from "@arcgis/core/smartMapping/renderers/predominance.js";
+import { getSchemesByTag as Je } from "@arcgis/core/smartMapping/symbology/predominance.js";
+import { createRenderer as Ze } from "@arcgis/core/smartMapping/renderers/relationship.js";
+import { getSchemesByTag as Ye } from "@arcgis/core/smartMapping/symbology/relationship.js";
+import { createAgeRenderer as Xe, createContinuousRenderer as et } from "@arcgis/core/smartMapping/renderers/size.js";
+import { createRenderer as tt } from "@arcgis/core/smartMapping/renderers/type.js";
+import { getSchemesByTag as rt } from "@arcgis/core/smartMapping/symbology/type.js";
+import { ToolNode as ot } from "@langchain/langgraph/prebuilt";
+import at from "@arcgis/core/layers/support/FeatureEffect.js";
+import Se from "@arcgis/core/layers/support/FeatureFilter.js";
+import * as nt from "@arcgis/core/geometry/operators/unionOperator.js";
+import { formatDateOnly as it, convertDateFormatToIntlOptions as Q, formatTimeOnly as st, formatDate as fe } from "@arcgis/core/intl.js";
+import ct from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
+import lt from "@arcgis/core/smartMapping/statistics/uniqueValues.js";
+import ut from "@arcgis/core/rest/support/TopFeaturesQuery.js";
+import dt from "@arcgis/core/rest/support/TopFilter.js";
+import pt from "@arcgis/core/WebLinkChart.js";
+import ve from "@arcgis/core/rest/knowledgeGraph/GraphQueryStreaming.js";
 import "@arcgis/core/views/LinkChartView.js";
-import { fetchKnowledgeGraph as pe, executeQueryStreaming as pt, executeSearchStreaming as ht } from "@arcgis/core/rest/knowledgeGraphService.js";
-import mt from "@arcgis/core/rest/knowledgeGraph/GraphSearchStreaming.js";
-const L = (e, t) => t ?? e, Tn = b.Root({
-  ...Ne(),
+import { fetchKnowledgeGraph as ge, executeQueryStreaming as mt, executeSearchStreaming as ht } from "@arcgis/core/rest/knowledgeGraphService.js";
+import yt from "@arcgis/core/rest/knowledgeGraph/GraphSearchStreaming.js";
+const P = (e, t) => t ?? e, Sn = b.Root({
+  ...ze(),
   // internal to the navigation agent
   intent: b({
-    reducer: L
+    reducer: P
   }),
   vectorSearchLayerResults: b({
-    reducer: L,
+    reducer: P,
     default: () => []
   }),
   vectorSearchFieldResults: b({
-    reducer: L
+    reducer: P
   }),
   navigationInternalState: b({
-    reducer: L,
+    reducer: P,
     default: () => ({
       toolCallMessage: void 0
     })
   })
 });
-async function yt(e, t) {
-  const o = k.getDefault().helperServices, a = o.geocode.find((h) => h.name === "ArcGIS World Geocoding Service") ?? o.geocode[0];
+async function ft(e, t) {
+  const o = F.getDefault().helperServices, a = o.geocode.find((m) => m.name === "ArcGIS World Geocoding Service") ?? o.geocode[0];
   if (!a)
     throw new Error("No geocoding service found in helperServices.");
-  const n = a.url, s = `${J.assetsPath?.endsWith("/") ? J.assetsPath : `${J.assetsPath}/`}esri/images/search/search-symbol-32.png`, u = (await Ae(n, {
+  const n = a.url, c = `${X.assetsPath?.endsWith("/") ? X.assetsPath : `${X.assetsPath}/`}esri/images/search/search-symbol-32.png`, l = (await Le(n, {
     address: { SingleLine: e },
     outFields: ["Match_addr"]
   }))?.[0];
-  if (!u?.extent || !u.location)
+  if (!l?.extent || !l.location)
     throw new Error(`Could not find location for: ${e}`);
-  const l = new Le({
-    url: s,
+  const u = new Pe({
+    url: c,
     width: 24,
     height: 24
   }), d = new De({
-    geometry: u.location,
-    symbol: l
+    geometry: l.location,
+    symbol: u
   });
-  t.graphics.removeAll(), t.graphics.add(d), await t.goTo(u.extent);
+  t.graphics.removeAll(), t.graphics.add(d), await t.goTo(l.extent);
   const p = {
-    address: u.address ?? "",
-    location: u.location ? u.location.toJSON() : null,
-    extent: u.extent ? u.extent.toJSON() : null
+    address: l.address ?? "",
+    location: l.location ? l.location.toJSON() : null,
+    extent: l.extent ? l.extent.toJSON() : null
   };
   return {
     text: `Successfully zoomed to ${e}.`,
     sharedStatePatch: { lastResolvedLocation: { value: p } }
   };
 }
-const ft = ["mapView"];
+const gt = ["mapView"];
 function $(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("NavigationAgent context missing");
-  const o = ft.filter((a) => !(a in r));
+  const o = gt.filter((a) => !(a in r));
   if (o.length)
     throw new Error(`NavigationAgent context missing: ${o.join(", ")}`);
   return r;
 }
-async function gt({ address: e }, t) {
+async function wt({ address: e }, t) {
   const { mapView: r } = $(t);
-  return await yt(e, r);
+  return await ft(e, r);
 }
-const wt = i.object({
+const bt = i.object({
   address: i.string().describe("The full address or place name to locate.")
-}), vn = f(gt, {
+}), vn = y(wt, {
   name: "goToAddress",
   description: "Geocodes an address using Esri's World Geocoding Service and zooms the map to that location.",
-  schema: wt
+  schema: bt
 });
-async function bt(e, t) {
+async function Tt(e, t) {
   const o = t.map.bookmarks;
   if (!o || o.length === 0)
     throw new Error("No bookmarks found in the map.");
-  const a = o.find((s) => s.name === e);
+  const a = o.find((c) => c.name === e);
   if (!a)
     throw new Error(`Bookmark with name "${e}" not found.`);
   const n = a.viewpoint;
@@ -131,60 +131,60 @@ async function bt(e, t) {
     throw new Error(`Bookmark with name "${e}" does not have a valid viewpoint.`);
   return await t.goTo(n), { text: `Navigated to bookmark: ${e}` };
 }
-async function Tt({ bookmarkName: e }, t) {
+async function St({ bookmarkName: e }, t) {
   const { mapView: r } = $(t);
-  return await Promise.resolve(bt(e, r));
+  return await Promise.resolve(Tt(e, r));
 }
-const vt = C.object({
-  bookmarkName: C.string().describe("The name of the bookmark to navigate to.")
-}), Sn = f(Tt, {
+const vt = E.object({
+  bookmarkName: E.string().describe("The name of the bookmark to navigate to.")
+}), xn = y(St, {
   name: "goToBookmark",
   description: "Go to the extent of the bookmark with the given name.",
   schema: vt
 });
-async function St(e, t, r) {
-  const o = r.map?.allLayers.find((s) => s.id === e);
+async function xt(e, t, r) {
+  const o = r.map?.allLayers.find((c) => c.id === e);
   if (!o)
     return { text: `Error: Layer with id ${e} not found` };
   const a = t?.trim() ? t : "1=1", n = o.createQuery();
   n.where = a;
   try {
-    const { extent: s, count: c } = await o.queryExtent(n);
-    if (c === 0)
+    const { extent: c, count: s } = await o.queryExtent(n);
+    if (s === 0)
       return { text: `No features found in ${o.title} matching: ${a}`, where: a };
-    if (s)
-      await r.goTo(s);
+    if (c)
+      await r.goTo(c);
     else
       return { text: `Error: Unable to determine extent for ${o.title}`, where: a };
-    const u = {
+    const l = {
       layerId: e,
       layerTitle: o.title ?? e,
       where: a,
-      count: c
+      count: s
     };
     return {
-      text: `Successfully zoomed to ${c} feature(s) in ${o.title} matching: ${a}`,
+      text: `Successfully zoomed to ${s} feature(s) in ${o.title} matching: ${a}`,
       where: a,
-      sharedStatePatch: { lastNavigatedFeatures: { value: u } }
+      sharedStatePatch: { lastNavigatedFeatures: { value: l } }
     };
-  } catch (s) {
-    return console.error("Error in goToFeatures:", s), { text: `Error: ${s instanceof Error ? s.message : "Unknown error"}`, where: a };
+  } catch (c) {
+    return console.error("Error in goToFeatures:", c), { text: `Error: ${c instanceof Error ? c.message : "Unknown error"}`, where: a };
   }
 }
-async function xt({ layerId: e, where: t }, r) {
+async function Rt({ layerId: e, where: t }, r) {
   const { mapView: o } = $(r);
-  return await St(e, t, o);
+  return await xt(e, t, o);
 }
-const Rt = C.object({
-  layerId: C.string().describe("The layerId of the layer to zoom to."),
-  where: C.string().describe("The sql-92 where clause used to query features to zoom to")
-}), xn = f(xt, {
+const $t = E.object({
+  layerId: E.string().describe("The layerId of the layer to zoom to."),
+  where: E.string().describe("The sql-92 where clause used to query features to zoom to")
+}), Rn = y(Rt, {
   name: "goToFeatures",
   description: "Go to the features that match the given filter related to the given layerId.",
-  schema: Rt
+  schema: $t
 });
-async function $t(e) {
-  const r = new Pe({
+async function Ct(e) {
+  const r = new je({
     xmin: -180,
     ymin: -90,
     xmax: 180,
@@ -195,14 +195,14 @@ async function $t(e) {
 }
 async function Et(e, t) {
   const { mapView: r } = $(t);
-  return await $t(r);
+  return await Ct(r);
 }
-const Ct = C.object({}), Rn = f(Et, {
+const Nt = E.object({}), $n = y(Et, {
   name: "goToFullExtent",
   description: "Zooms the map to the full world extent using Esri's Geocoding Service.",
-  schema: Ct
+  schema: Nt
 });
-async function It(e) {
+async function Ft(e) {
   const r = e.map.initialViewProperties?.viewpoint?.targetGeometry;
   if (r)
     await e.goTo(r);
@@ -210,16 +210,16 @@ async function It(e) {
     throw new Error("Initial extent is undefined");
   return { text: "Successfully zoomed to home extent" };
 }
-async function Ft(e, t) {
+async function It(e, t) {
   const { mapView: r } = $(t);
-  return await It(r);
+  return await Ft(r);
 }
-const kt = i.object({}), $n = f(Ft, {
+const kt = i.object({}), Cn = y(It, {
   name: "goToHomeExtent",
   description: "Go to the initial web map view extent",
   schema: kt
 });
-async function Nt(e, t) {
+async function zt(e, t) {
   await t.when();
   const r = t.map?.allLayers.find((a) => a.id === e);
   if (!r)
@@ -227,34 +227,34 @@ async function Nt(e, t) {
   let o;
   return (r.type === "link-chart" || r.type === "knowledge-graph-sublayer") && t.map?.activeLinkChartLayer ? o = t.map.diagramNodesExtent : o = r.fullExtent, o ? (await t.goTo(o), r.visible = !0, { text: `Successfully zoomed to: ${r.title ?? ""}` }) : { text: "Layer has no defined extent. Cannot zoom to layer." };
 }
-async function zt({ layerId: e }, t) {
+async function qt({ layerId: e }, t) {
   const { mapView: r } = $(t);
-  return await Nt(e, r);
+  return await zt(e, r);
 }
-const qt = C.object({
-  layerId: C.string().describe("The id of the layer to navigate to")
-}), En = f(zt, {
+const At = E.object({
+  layerId: E.string().describe("The id of the layer to navigate to")
+}), En = y(qt, {
   name: "goToLayer",
   description: "Zooms the map view to the full extent of the top matching layer.",
-  schema: qt
+  schema: At
 });
 async function Dt(e, t) {
   return await t.goTo({ scale: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function At({ scale: e }, t) {
+async function Lt({ scale: e }, t) {
   const { mapView: r } = $(t);
   return await Dt(e, r);
 }
-const Lt = i.object({
+const Pt = i.object({
   scale: i.number().describe("The map scale of the view to go to.")
-}), Cn = f(At, {
+}), Nn = y(Lt, {
   name: "goToScale",
   description: "Go to the specified view scale.",
-  schema: Lt
+  schema: Pt
 });
-async function Pt(e, t, r) {
+async function jt(e, t, r) {
   const a = {
-    target: new ye({
+    target: new Te({
       longitude: e.longitude,
       latitude: e.latitude,
       spatialReference: { wkid: 4326 }
@@ -266,40 +266,40 @@ async function Pt(e, t, r) {
     r?.scale !== void 0 ? `scale 1:${r.scale}` : ""
   ].filter(Boolean).join(", ")}` };
 }
-async function jt({
+async function Gt({
   center: e,
   zoom: t,
   scale: r
 }, o) {
   const { mapView: a } = $(o);
-  return await Pt(e, a, { zoom: t, scale: r });
+  return await jt(e, a, { zoom: t, scale: r });
 }
-const Gt = i.object({
+const Ot = i.object({
   center: i.object({
     longitude: i.number().describe("The longitude (x-coordinate) of the point to navigate to."),
     latitude: i.number().describe("The latitude (y-coordinate) of the point to navigate to.")
   }),
   zoom: i.number().optional().describe("The zoom level. Higher values = more zoomed in."),
   scale: i.number().optional().describe("The map scale. Alternative to zoom. Smaller numbers = more zoomed in.")
-}), In = f(jt, {
+}), Fn = y(Gt, {
   name: "goToViewpoint",
   description: "Go to the specified viewpoint. This can contain a combination of scale, center, zoom, etc.",
-  schema: Gt
+  schema: Ot
 });
-async function Ot(e, t) {
+async function Mt(e, t) {
   return await t.goTo({ zoom: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function Mt({ zoom: e }, t) {
+async function Qt({ zoom: e }, t) {
   const { mapView: r } = $(t);
-  return await Ot(e, r);
+  return await Mt(e, r);
 }
-const Qt = i.object({
+const _t = i.object({
   zoom: i.number().min(1).max(20).describe("The zoom level of the view to go to.")
-}), Fn = f(Mt, {
+}), In = y(Qt, {
   name: "goToZoom",
   description: 'Go to the specified zoom level. If input is generic (e.g. "zoom in", then only zoom to the next appropriate level - increase level for zooming in and decrease for zooming out.).',
-  schema: Qt
-}), he = /* @__PURE__ */ Object.assign({
+  schema: _t
+}), we = /* @__PURE__ */ Object.assign({
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_current_lc_context.md": () => import("./arcgis_knowledge_current_lc_context.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_current_map_context.md": () => import("./arcgis_knowledge_current_map_context.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_lucene_generation_prompt.md": () => import("./arcgis_knowledge_lucene_generation_prompt.js").then((e) => e.default),
@@ -313,19 +313,19 @@ const Qt = i.object({
   "../agents/navigation/prompts/navigation_intent_prompt.md": () => import("./navigation_intent_prompt.js").then((e) => e.default),
   "../agents/navigation/prompts/navigation_tool_prompt.md": () => import("./navigation_tool_prompt.js").then((e) => e.default)
 });
-async function Y(e) {
-  const t = Object.entries(he).find(([r]) => r.endsWith(`/${e}.md`));
+async function te(e) {
+  const t = Object.entries(we).find(([r]) => r.endsWith(`/${e}.md`));
   if (!t)
     throw new Error(`Prompt not found: ${e}
 Available prompts:
-${Object.keys(he).join(`
+${Object.keys(we).join(`
 `)}`);
   return await t[1]();
 }
-const _t = (e, t = 300) => {
+const Wt = (e, t = 300) => {
   const r = e.replace(/\s+/gu, " ").replace(/[*_`#>\-]/gu, "").trim();
   return r.length > t ? `${r.slice(0, t)}...` : r;
-}, we = (e, t) => {
+}, xe = (e, t) => {
   const o = e?.configurable?.services?.[t];
   if (o == null)
     throw new Error(`${t} missing in config.configurable.services`);
@@ -337,35 +337,35 @@ const _t = (e, t = 300) => {
       throw new Error(`${t} requires services.${n} to be available.`);
   return r;
 };
-async function Wt(e) {
+async function Vt(e) {
   const { fields: t, layer: r, view: o, styleName: a, colorSchemeTags: n } = e;
-  let s;
-  return n ? s = Ge({
-    basemapTheme: await ue(o),
+  let c;
+  return n ? c = Oe({
+    basemapTheme: await ye(o),
     geometryType: r.geometryType,
     includedTags: n,
     numColors: Math.min(t.length, 8)
-  })[0] : s = Oe({
-    basemapTheme: await ue(o),
+  })[0] : c = Me({
+    basemapTheme: await ye(o),
     geometryType: r.geometryType,
     numColors: Math.min(t.length, 8)
   }).primaryScheme, {
     layer: r,
     view: o,
-    attributes: t.map((c) => ({
-      field: c,
-      label: r.fields.find((u) => u.name === c)?.alias ?? ""
+    attributes: t.map((s) => ({
+      field: s,
+      label: r.fields.find((l) => l.name === s)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     includeSizeVariable: a.includes("Size"),
-    pieChartScheme: s
+    pieChartScheme: c
   };
 }
-async function Vt(e) {
-  return await je(e);
+async function Ut(e) {
+  return await Ge(e);
 }
-async function Ut({
+async function Kt({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -373,41 +373,41 @@ async function Ut({
   colorSchemes: a,
   includeSize: n
 }) {
-  const s = t, c = e?.allLayers.find((d) => d.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((d) => d.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const l = {
+  const u = {
     styleName: n ? "chart-size" : "chart",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a
   };
   try {
-    const d = await Wt(l), p = await Vt(d);
-    return c.renderer = p.renderer, c.visible = !0, `Chart renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
+    const d = await Vt(u), p = await Ut(d);
+    return s.renderer = p.renderer, s.visible = !0, `Chart renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
   } catch (d) {
     return `Error applying chart renderer: ${d instanceof Error ? d.message : String(d)}`;
   }
 }
-const Kt = ["mapView"];
+const Bt = ["mapView"];
 function R(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("LayerStylingAgent context missing");
-  const o = Kt.filter((a) => !(a in r));
+  const o = Bt.filter((a) => !(a in r));
   if (o.length)
     throw new Error(`LayerStylingAgent context missing: ${o.join(", ")}`);
   return r;
 }
-async function Bt({
+async function Ht({
   layerId: e,
   fields: t,
   colorSchemes: r,
   includeSize: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Ut({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Kt({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -416,12 +416,12 @@ async function Bt({
     includeSize: o
   });
 }
-const Ht = i.object({
+const Jt = i.object({
   layerId: i.string().describe("The id of the layer to apply the chart renderer to"),
   fields: i.array(i.string()).describe("The fields to use for the chart renderer (multiple numeric fields)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   includeSize: i.boolean().optional().describe("Whether to vary the chart size (chart-size)")
-}), Nn = f(Bt, {
+}), zn = y(Ht, {
   name: "chart",
   description: `Label: Charts
     Description: Show the values of two or more categories as a proportion of the total using a pie chart.
@@ -434,30 +434,30 @@ const Ht = i.object({
     Keywords: pie, chart, all categories, breakdown, proportion, total, amount, how much, sum, graduated size, proportional size
     Example: Show the total number of homes built in each decade using a pie chart for each feature and vary the size of each chart based on the total of all categories.
     Fields: This style requires 2-8 number fields.`,
-  schema: Ht
+  schema: Jt
 });
-function Jt(e) {
-  const { fields: t, layer: r, view: o, theme: a, colorSchemeTags: n } = e, s = t[0];
-  let c;
-  return n && (c = re({
+function Zt(e) {
+  const { fields: t, layer: r, view: o, theme: a, colorSchemeTags: n } = e, c = t[0];
+  let s;
+  return n && (s = ce({
     geometryType: r.geometryType,
     includedTags: n,
     theme: a || "high-to-low"
   })[0]), {
     layer: r,
     view: o,
-    startTime: s,
+    startTime: c,
     endTime: /* @__PURE__ */ new Date(),
     theme: a,
     sizeOptimizationEnabled: !0,
     outlineOptimizationEnabled: !0,
-    colorScheme: c
+    colorScheme: s
   };
 }
-async function Zt(e) {
-  return await Me(e);
+async function Yt(e) {
+  return await Qe(e);
 }
-async function Yt({
+async function Xt({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -465,32 +465,32 @@ async function Yt({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "color-age",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = Jt(u), d = await Zt(l);
-    return c.renderer = d.renderer, c.visible = !0, `Color-age renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying color-age renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = Zt(l), d = await Yt(u);
+    return s.renderer = d.renderer, s.visible = !0, `Color-age renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying color-age renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Xt({
+async function er({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Yt({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Xt({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -499,44 +499,44 @@ async function Xt({
     theme: o
   });
 }
-const er = i.object({
+const tr = i.object({
   layerId: i.string().describe("The id of the layer to apply the color-age renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the color-age renderer (temporal/date data)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), zn = f(Xt, {
+}), qn = y(er, {
   name: "color-age",
   description: `Label: Age (color)
     Description: Use colors along a continuous color ramp to represent the age of features. Age reflects the length of time from a start date to an end date.
     Keywords: since, age, how old, how long
     Example: Show the age of each feature based on its reported date.
     Fields: This style requires at least one field with a date type.`,
-  schema: er
+  schema: tr
 });
-function tr(e) {
+function rr(e) {
   const { fields: t, layer: r, view: o, colorSchemeTags: a } = e;
-  let { theme: n } = e, s = t[1];
-  const c = t[0];
-  let u;
-  return a && (u = re({
+  let { theme: n } = e, c = t[1];
+  const s = t[0];
+  let l;
+  return a && (l = ce({
     geometryType: r.geometryType,
     includedTags: a,
     theme: n || "high-to-low"
   })[0]), {
     layer: r,
     view: o,
-    field: c,
-    normalizationField: s,
+    field: s,
+    normalizationField: c,
     theme: n,
     sizeOptimizationEnabled: !0,
     outlineOptimizationEnabled: !0,
-    colorScheme: u
+    colorScheme: l
   };
 }
-async function rr(e) {
-  return await Qe(e);
+async function or(e) {
+  return await _e(e);
 }
-async function or({
+async function ar({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -544,32 +544,32 @@ async function or({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "color",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = tr(u), d = await rr(l);
-    return c.renderer = d.renderer, c.visible = !0, `Color renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying color renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = rr(l), d = await or(u);
+    return s.renderer = d.renderer, s.visible = !0, `Color renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying color renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function ar({
+async function nr({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await or({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await ar({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -578,43 +578,43 @@ async function ar({
     theme: o
   });
 }
-const nr = i.object({
+const ir = i.object({
   layerId: i.string().describe("The id of the layer to apply the color renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the color renderer"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), qn = f(ar, {
+}), An = y(nr, {
   name: "color",
   description: `Label: Counts and Amounts (color)
     Description: Vary color along a continuous color ramp to represent numeric or ranked data.
     Keywords: graduated color, choropleth, continuous color, hue, color, gradation, saturation, lightness, percent, rate, ratio, index, how much, increase, decrease
     Example: Color each feature based on the population density.
     Fields: This style requires a single field with a number type. A second number field may be specified for normalizing the value of the first field.`,
-  schema: nr
+  schema: ir
 });
-function ir(e) {
+function sr(e) {
   const { fields: t, layer: r, view: o, colorSchemeTags: a, theme: n } = e;
-  let s, c;
-  const u = t[0];
-  return a && (c = re({
+  let c, s;
+  const l = t[0];
+  return a && (s = ce({
     geometryType: r.geometryType,
     includedTags: a,
     theme: n || "high-to-low"
   })[0]), {
     layer: r,
     view: o,
-    field: u,
-    normalizationField: s,
+    field: l,
+    normalizationField: c,
     theme: n,
     colorOptions: {
-      colorScheme: c
+      colorScheme: s
     }
   };
 }
-async function sr(e) {
-  return await _e(e);
+async function cr(e) {
+  return await We(e);
 }
-async function cr({
+async function lr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -622,32 +622,32 @@ async function cr({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "color-size-univariate",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = ir(u), d = await sr(l);
-    return c.renderer = d.renderer, c.visible = !0, `Color-size-univariate renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying color-size-univariate renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = sr(l), d = await cr(u);
+    return s.renderer = d.renderer, s.visible = !0, `Color-size-univariate renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying color-size-univariate renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function lr({
+async function ur({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await cr({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await lr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -656,24 +656,24 @@ async function lr({
     theme: o
   });
 }
-const ur = i.object({
+const dr = i.object({
   layerId: i.string().describe("The id of the layer to apply the color-size univariate renderer to"),
   fields: i.array(i.string()).describe("The fields to use for the color-size univariate renderer"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color and size ramps")
-}), Dn = f(lr, {
+}), Dn = y(ur, {
   name: "color-size-univariate",
   description: `Label: Color and Size (univariate)
     Description: Vary symbol size and color based on the values of two numeric attributes.
     Keywords: continuous color, hue, color, size, gradation, saturation, lightness, percent, rate, ratio, index, how much, increase, decrease, amount
     Example: Color each feature based on the percentage of the population that owns a home and vary the size of each point based on total population.
     Fields: This style requires at least two fields: one determining the color of each feature, the other determining the size of each feature. Each field may be normalized by an additional normalization field.`,
-  schema: ur
+  schema: dr
 });
-function dr(e) {
+function pr(e) {
   const { fields: t, layer: r, view: o, colorSchemeTags: a } = e;
   let n;
-  return a && (n = Ve({
+  return a && (n = Ue({
     includedTags: a,
     numColors: Math.min(t.length, 8)
   })[0]), {
@@ -682,16 +682,16 @@ function dr(e) {
     legendOptions: {
       unit: "units"
     },
-    attributes: t.map((s) => ({
-      field: s,
-      label: r.fields.find((c) => c.name === s)?.alias ?? ""
+    attributes: t.map((c) => ({
+      field: c,
+      label: r.fields.find((s) => s.name === c)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     dotDensityScheme: n
   };
 }
-async function pr(e) {
-  return await We(e);
+async function mr(e) {
+  return await Ve(e);
 }
 async function hr({
   arcgisMap: e,
@@ -700,24 +700,24 @@ async function hr({
   fields: o,
   colorSchemes: a
 }) {
-  const n = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const n = t, c = e?.allLayers.find((l) => l.id === r);
+  if (!c)
     return `Could not find layer for id: ${r}`;
-  const c = {
+  const s = {
     styleName: "dot-density",
     fields: o,
-    layer: s,
+    layer: c,
     view: n,
     colorSchemeTags: a
   };
   try {
-    const u = dr(c), l = await pr(u);
-    return s.renderer = l.renderer, s.visible = !0, `Dot Density renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
-  } catch (u) {
-    return `Error applying dot density renderer: ${u instanceof Error ? u.message : String(u)}`;
+    const l = pr(s), u = await mr(l);
+    return c.renderer = u.renderer, c.visible = !0, `Dot Density renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
+  } catch (l) {
+    return `Error applying dot density renderer: ${l instanceof Error ? l.message : String(l)}`;
   }
 }
-async function mr({
+async function yr({
   layerId: e,
   fields: t,
   colorSchemes: r
@@ -731,11 +731,11 @@ async function mr({
     colorSchemes: r
   });
 }
-const yr = i.object({
+const fr = i.object({
   layerId: i.string().describe("The id of the layer to apply the dot density renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the dot density renderer (population or count data)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), An = f(mr, {
+}), Ln = y(yr, {
   name: "dot-density",
   description: `Dot Density
     Use dot density to visualize the distribution of one attribute or compare the density of multiple attributes. This is only valid for polygon layers.
@@ -749,56 +749,56 @@ const yr = i.object({
     - Display demographic patterns within census tracts
     **Fields:** Requires 2-8 number fields.
     **Keywords:** density, how much, how many, total, number, amount`,
-  schema: yr
+  schema: fr
 });
-function fr(e) {
+function gr(e) {
   const { fields: t, layer: r, view: o, colorSchemeTags: a } = e;
   let n;
-  const s = t[0];
-  return a && (n = Ke({
+  const c = t[0];
+  return a && (n = Be({
     includedTags: a,
     basemap: o.map?.basemap || "topo"
   })[0]), {
     layer: r,
     view: o,
-    field: s,
+    field: c,
     heatmapScheme: n
   };
 }
-async function gr(e) {
-  return await Ue(e);
+async function wr(e) {
+  return await Ke(e);
 }
-async function wr({
+async function br({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
   fields: o,
   colorSchemes: a
 }) {
-  const n = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const n = t, c = e?.allLayers.find((l) => l.id === r);
+  if (!c)
     return `Could not find layer for id: ${r}`;
-  const c = {
+  const s = {
     styleName: "heatmap",
     fields: o,
-    layer: s,
+    layer: c,
     view: n,
     colorSchemeTags: a
   };
   try {
-    const u = fr(c), l = await gr(u);
-    return s.renderer = l.renderer, s.visible = !0, `Heatmap renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
-  } catch (u) {
-    return `Error applying heatmap renderer: ${u instanceof Error ? u.message : String(u)}`;
+    const l = gr(s), u = await wr(l);
+    return c.renderer = u.renderer, c.visible = !0, `Heatmap renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
+  } catch (l) {
+    return `Error applying heatmap renderer: ${l instanceof Error ? l.message : String(l)}`;
   }
 }
-async function br({
+async function Tr({
   layerId: e,
   fields: t,
   colorSchemes: r
 }, o) {
   const { mapView: a } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await wr({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await br({
     arcgisMap: a.map,
     arcgisMapView: a,
     layerId: e,
@@ -806,40 +806,40 @@ async function br({
     colorSchemes: r
   });
 }
-const Tr = i.object({
+const Sr = i.object({
   layerId: i.string().describe("The id of the layer to apply the heatmap renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the heatmap renderer (typically point density)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), Ln = f(br, {
+}), Pn = y(Tr, {
   name: "heatmap",
   description: `Label: Heat Map
 Description: Show areas of high density with colors that appear to glow hotter. This is only valid for point layers.
 Keywords: density, heatmap, hot spots, pattern, cluster
 Example: Create a heatmap
 Fields: This typically requires zero or one field of type number.`,
-  schema: Tr
+  schema: Sr
 });
 function vr(e) {
   const { fields: t, layer: r, view: o, styleName: a, colorSchemeTags: n } = e;
-  let s;
-  return n && (s = He({
+  let c;
+  return n && (c = Je({
     geometryType: r.geometryType,
     includedTags: n,
     numColors: Math.min(t.length, 10)
   })[0]), {
     layer: r,
     view: o,
-    fields: t.map((c) => ({ name: c })).slice(0, 9),
+    fields: t.map((s) => ({ name: s })).slice(0, 9),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     includeSizeVariable: a.includes("Size"),
-    predominanceScheme: s
+    predominanceScheme: c
   };
 }
-async function Sr(e) {
-  return await Be(e);
+async function xr(e) {
+  return await He(e);
 }
-async function xr({
+async function Rr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -847,31 +847,31 @@ async function xr({
   colorSchemes: a,
   includeSize: n
 }) {
-  const s = t, c = e?.allLayers.find((d) => d.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((d) => d.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const l = {
+  const u = {
     styleName: n ? "predominance-size" : "predominance",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a
   };
   try {
-    const d = vr(l), p = await Sr(d);
-    return c.renderer = p.renderer, c.visible = !0, `Predominance renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
+    const d = vr(u), p = await xr(d);
+    return s.renderer = p.renderer, s.visible = !0, `Predominance renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
   } catch (d) {
     return `Error applying predominance renderer: ${d instanceof Error ? d.message : String(d)}`;
   }
 }
-async function Rr({
+async function $r({
   layerId: e,
   fields: t,
   colorSchemes: r,
   includeSize: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await xr({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Rr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -880,12 +880,12 @@ async function Rr({
     includeSize: o
   });
 }
-const $r = i.object({
+const Cr = i.object({
   layerId: i.string().describe("The id of the layer to apply the predominance renderer to"),
   fields: i.array(i.string()).describe("The fields to use for the predominance renderer (competing categories)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   includeSize: i.boolean().optional().describe("Whether to include size visualization (predominance-size)")
-}), Pn = f(Rr, {
+}), jn = y($r, {
   name: "predominance",
   description: `Label: Predominant category
     Description: Compare attributes that share a common subject and unit of measurement to see which has the highest value.
@@ -898,63 +898,63 @@ const $r = i.object({
     Keywords: predominant, winner, won, competing, most, most common, most frequent, dominant, prevalent, top, amount, total, how much, proportional size, graduated size, sum
     Example: Show the predominant crop in each area and vary the size of each symbol based on the total of all categories.
     Fields: This style relies on 2-10 number fields.`,
-  schema: $r
+  schema: Cr
 });
 function Er(e) {
   const { fields: t, layer: r, view: o, colorSchemeTags: a } = e;
   let n;
-  const s = {
+  const c = {
     field: t[0]
-  }, c = {
+  }, s = {
     field: t[1]
   };
-  return a && (n = Ze({
+  return a && (n = Ye({
     geometryType: r.geometryType,
     includedTags: a
   })[0]), {
     layer: r,
     view: o,
-    field1: s,
-    field2: c,
+    field1: c,
+    field2: s,
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     relationshipScheme: n
   };
 }
-async function Cr(e) {
-  return await Je(e);
+async function Nr(e) {
+  return await Ze(e);
 }
-async function Ir({
+async function Fr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
   fields: o,
   colorSchemes: a
 }) {
-  const n = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const n = t, c = e?.allLayers.find((l) => l.id === r);
+  if (!c)
     return `Could not find layer for id: ${r}`;
-  const c = {
+  const s = {
     styleName: "relationship",
     fields: o,
-    layer: s,
+    layer: c,
     view: n,
     colorSchemeTags: a
   };
   try {
-    const u = Er(c), l = await Cr(u);
-    return s.renderer = l.renderer, s.visible = !0, `Relationship renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
-  } catch (u) {
-    return `Error applying relationship renderer: ${u instanceof Error ? u.message : String(u)}`;
+    const l = Er(s), u = await Nr(l);
+    return c.renderer = u.renderer, c.visible = !0, `Relationship renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
+  } catch (l) {
+    return `Error applying relationship renderer: ${l instanceof Error ? l.message : String(l)}`;
   }
 }
-async function Fr({
+async function Ir({
   layerId: e,
   fields: t,
   colorSchemes: r
 }, o) {
   const { mapView: a } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Ir({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Fr({
     arcgisMap: a.map,
     arcgisMapView: a,
     layerId: e,
@@ -966,7 +966,7 @@ const kr = i.object({
   layerId: i.string().describe("The id of the layer to apply the relationship renderer to"),
   fields: i.array(i.string()).describe("The two fields to use for the relationship renderer (bivariate visualization)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), jn = f(Fr, {
+}), Gn = y(Ir, {
   name: "relationship",
   description: `Label: Relationship
     Description: Overlays two color ramps to represent the relationship between two numeric attributes.
@@ -975,7 +975,7 @@ const kr = i.object({
     Fields: This style requires two number fields.`,
   schema: kr
 });
-function Nr(e) {
+function zr(e) {
   const { fields: t, layer: r, view: o, theme: a } = e, n = t[0];
   return {
     layer: r,
@@ -987,10 +987,10 @@ function Nr(e) {
     outlineOptimizationEnabled: !0
   };
 }
-async function zr(e) {
-  return await Ye(e);
+async function qr(e) {
+  return await Xe(e);
 }
-async function qr({
+async function Ar({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -998,22 +998,22 @@ async function qr({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "size-age",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = Nr(u), d = await zr(l);
-    return c.renderer = d.renderer, c.visible = !0, `Size-age renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying size-age renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = zr(l), d = await qr(u);
+    return s.renderer = d.renderer, s.visible = !0, `Size-age renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying size-age renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
 async function Dr({
@@ -1023,7 +1023,7 @@ async function Dr({
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await qr({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Ar({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -1032,38 +1032,38 @@ async function Dr({
     theme: o
   });
 }
-const Ar = i.object({
+const Lr = i.object({
   layerId: i.string().describe("The id of the layer to apply the size-age renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the size-age renderer (temporal data with size)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), Gn = f(Dr, {
+}), On = y(Dr, {
   name: "size-age",
   description: `Label: Age (size)
     Description: Vary symbol sizes along a continuous ramp to represent the age of features. Age reflects the length of time from a start date to an end date.
     Keywords: since, age, how old, how long
     Example: Change the size of features so older features are larger than new features.
     Fields: This style requires at least one field with a date type.`,
-  schema: Ar
+  schema: Lr
 });
-function Lr(e) {
+function Pr(e) {
   const { fields: t, layer: r, view: o } = e;
   let { theme: a } = e, n = t[1];
-  const s = t[0];
+  const c = t[0];
   return {
     layer: r,
     view: o,
-    field: s,
+    field: c,
     normalizationField: n,
     theme: a,
     sizeOptimizationEnabled: !0,
     outlineOptimizationEnabled: !0
   };
 }
-async function Pr(e) {
-  return await Xe(e);
+async function jr(e) {
+  return await et(e);
 }
-async function jr({
+async function Gr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -1071,32 +1071,32 @@ async function jr({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "size",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = Lr(u), d = await Pr(l);
-    return c.renderer = d.renderer, c.visible = !0, `Size renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying size renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = Pr(l), d = await jr(u);
+    return s.renderer = d.renderer, s.visible = !0, `Size renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying size renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Gr({
+async function Or({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await jr({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Gr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -1105,12 +1105,12 @@ async function Gr({
     theme: o
   });
 }
-const Or = i.object({
+const Mr = i.object({
   layerId: i.string().describe("The id of the layer to apply the size renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the size renderer (numeric data)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), On = f(Gr, {
+}), Mn = y(Or, {
   name: "size",
   description: `Label: Counts and Amounts (size)
     Description: Vary symbol sizes along a continuous ramp to represent numeric or ranked data.
@@ -1123,29 +1123,29 @@ const Or = i.object({
     Keywords: graduated size, proportional size, classed size, how much, total, number, when
     Example: Vary the size of each feature based on the date a ticket was completed.
     Fields: This style requires a single field with a date type.`,
-  schema: Or
+  schema: Mr
 });
-function Mr(e) {
-  const { fields: t, layer: r, view: o, colorSchemeTags: a } = e, n = t[0], s = t[1], c = t[2];
-  let u;
-  return a && (u = tt({
+function Qr(e) {
+  const { fields: t, layer: r, view: o, colorSchemeTags: a } = e, n = t[0], c = t[1], s = t[2];
+  let l;
+  return a && (l = rt({
     geometryType: r.geometryType,
     includedTags: a
   })[0]), {
     layer: r,
     view: o,
     field: n,
-    field2: s,
-    field3: c,
+    field2: c,
+    field3: s,
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
-    typeScheme: u
+    typeScheme: l
   };
 }
-async function Qr(e) {
-  return await et(e);
+async function _r(e) {
+  return await tt(e);
 }
-async function _r({
+async function Wr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -1153,32 +1153,32 @@ async function _r({
   colorSchemes: a,
   theme: n
 }) {
-  const s = t, c = e?.allLayers.find((l) => l.id === r);
-  if (!c)
+  const c = t, s = e?.allLayers.find((u) => u.id === r);
+  if (!s)
     return `Could not find layer for id: ${r}`;
-  const u = {
+  const l = {
     styleName: "type",
     fields: o,
-    layer: c,
-    view: s,
+    layer: s,
+    view: c,
     colorSchemeTags: a,
     theme: n
   };
   try {
-    const l = Mr(u), d = await Qr(l);
-    return c.renderer = d.renderer, c.visible = !0, `Type renderer applied to layer: ${c.title ?? c.id} using fields ${o.join(", ")}`;
-  } catch (l) {
-    return `Error applying type renderer: ${l instanceof Error ? l.message : String(l)}`;
+    const u = Qr(l), d = await _r(u);
+    return s.renderer = d.renderer, s.visible = !0, `Type renderer applied to layer: ${s.title ?? s.id} using fields ${o.join(", ")}`;
+  } catch (u) {
+    return `Error applying type renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Wr({
+async function Vr({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: o
 }, a) {
   const { mapView: n } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await _r({
+  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Wr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -1187,90 +1187,90 @@ async function Wr({
     theme: o
   });
 }
-const Vr = i.object({
+const Ur = i.object({
   layerId: i.string().describe("The id of the layer to apply the type renderer to"),
   fields: i.array(i.string()).describe("The field(s) to use for the type renderer (categorical data)"),
   colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
   theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color scheme")
-}), Mn = f(Wr, {
+}), Qn = y(Vr, {
   name: "type",
   description: `Label: Types (unique symbols)
 Description: Represent features as categories with different symbol colors or shapes. Examples include type of tree, road class, or province name.
 Keywords: categorical, category, type, unique, discrete, point of interest, region, group
 Example: Color each feature based on the region it belongs to
 Fields: This style requires a single field which may be a string, number, or date type. It is usually a string.`,
-  schema: Vr
-}), Qn = b.Root({
-  ...U(),
+  schema: Ur
+}), _n = b.Root({
+  ...B(),
   vectorSearchLayerIds: b(),
   vectorSearchFieldResults: b(),
   layerFieldInfo: b(),
   selectedLayerId: b()
-}), _n = b.Root({
-  ...U(),
+}), Wn = b.Root({
+  ...B(),
   vectorSearchLayerIds: b(),
   vectorSearchFieldResults: b(),
   layerFieldInfo: b(),
   queryResponse: b(),
   dataExplorationMessages: b({
-    reducer: me,
+    reducer: be,
     default: () => []
   })
-}), Ur = ["mapView"];
-function N(e) {
+}), Kr = ["mapView"];
+function I(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("DataExplorationAgent context missing");
-  const o = Ur.filter((a) => !(a in r));
+  const o = Kr.filter((a) => !(a in r));
   if (o.length)
     throw new Error(`DataExplorationAgent context missing: ${o.join(", ")}`);
   return r;
 }
-const Kr = (e) => {
+const Br = (e) => {
   const t = e.map?.allLayers.filter((o) => o.type === "feature");
   let r = 0;
   return t?.forEach((o) => {
     const a = o;
     a.featureEffect && (a.featureEffect = null, r++);
   }), r > 0 ? `Cleared filters from ${r} layer(s). View unchanged.` : "No active filters to clear. View unchanged.";
-}, Br = async (e, t) => {
-  const { mapView: r } = N(t);
-  return Kr(r);
-}, Hr = f(Br, {
+}, Hr = async (e, t) => {
+  const { mapView: r } = I(t);
+  return Br(r);
+}, Jr = y(Hr, {
   name: "clearFilters",
   description: "Clears all feature effects/filters from the map but does NOT change the current view. Use when user says 'clear filters', 'reset filters', 'remove filters', 'show all features', or wants to remove emphasis without navigating anywhere.",
   schema: i.object({})
-}), Jr = async (e) => {
+}), Zr = async (e) => {
   e.map?.allLayers.filter((a) => a.type === "feature")?.forEach((a) => {
     const n = a;
     n.featureEffect && (n.featureEffect = null);
   });
   const o = e.map.initialViewProperties?.viewpoint?.targetGeometry;
   return o ? (await e.goTo(o), "Cleared all filters and returned to home extent.") : "Cleared all filters. Could not determine home extent.";
-}, Zr = async (e, t) => {
-  const { mapView: r } = N(t);
-  return await Jr(r);
-}, Yr = f(Zr, {
+}, Yr = async (e, t) => {
+  const { mapView: r } = I(t);
+  return await Zr(r);
+}, Xr = y(Yr, {
   name: "resetMap",
   description: "Clears all feature effects/filters from the map AND zooms to the home extent (initial map view). Use when user says 'reset map', 'reset the map', 'start over', or wants to both clear filters and return to the initial view.",
   schema: i.object({})
 });
-function W(e) {
+function U(e) {
   return "point" in e && e.point !== void 0;
 }
-function P(e) {
+function j(e) {
   return "layerId" in e && e.layerId !== void 0;
 }
-const K = async (e, t) => {
-  if (W(e)) {
+const H = async (e, t) => {
+  if (U(e)) {
     const { point: r } = e;
-    return { geometry: new ye({
+    return { geometry: new Te({
       x: r.x,
       y: r.y,
       spatialReference: r.spatialReference ? { wkid: r.spatialReference.wkid } : t.spatialReference
     }) };
   }
-  if (P(e)) {
+  if (j(e)) {
     const r = t.map?.allLayers.find(
       (a) => a.id === e.layerId
     );
@@ -1289,15 +1289,15 @@ const K = async (e, t) => {
         };
       let n;
       if (a.features.length === 1) {
-        const s = a.features[0].geometry;
-        if (!s)
+        const c = a.features[0].geometry;
+        if (!c)
           return { error: "The geometry of the first feature is undefined or null." };
-        n = s;
+        n = c;
       } else {
-        const s = a.features.map((u) => u.geometry), c = at.executeMany(s);
-        if (!c)
+        const c = a.features.map((l) => l.geometry), s = nt.executeMany(c);
+        if (!s)
           return { error: "Failed to create a combined geometry." };
-        n = c;
+        n = s;
       }
       return n.spatialReference || (n.spatialReference = t.spatialReference), { geometry: n };
     } catch (a) {
@@ -1305,73 +1305,73 @@ const K = async (e, t) => {
     }
   }
   return { error: "Invalid geometry configuration provided" };
-}, Xr = async (e, t, r, o, a, n) => {
-  const s = e.map?.allLayers.find((u) => u.id === t);
-  if (!s)
+}, eo = async (e, t, r, o, a, n) => {
+  const c = e.map?.allLayers.find((l) => l.id === t);
+  if (!c)
     return { success: !1, error: `Layer '${t}' not found.` };
-  const c = s.createQuery();
-  c.where = r ?? "1=1", o && (c.geometry = o, c.spatialRelationship = "intersects", a && (c.distance = a), n && (c.units = n));
+  const s = c.createQuery();
+  s.where = r ?? "1=1", o && (s.geometry = o, s.spatialRelationship = "intersects", a && (s.distance = a), n && (s.units = n));
   try {
-    const { extent: u, count: l } = await s.queryExtent(c);
-    return !u || l === 0 ? {
+    const { extent: l, count: u } = await c.queryExtent(s);
+    return !l || u === 0 ? {
       success: !1,
-      error: `No features found for filter (where: ${c.where}${o ? ", spatial filter used" : ""})`
-    } : (await e.goTo(u), { success: !0 });
-  } catch (u) {
+      error: `No features found for filter (where: ${s.where}${o ? ", spatial filter used" : ""})`
+    } : (await e.goTo(l), { success: !0 });
+  } catch (l) {
     return {
       success: !1,
-      error: u instanceof Error ? u.message : String(u)
+      error: l instanceof Error ? l.message : String(l)
     };
   }
-}, eo = async (e, t, r, o, a, n) => {
-  const s = t.map?.allLayers.find(
+}, to = async (e, t, r, o, a, n) => {
+  const c = t.map?.allLayers.find(
     (p) => p.id === e.layerId
   );
-  if (!s)
+  if (!c)
     return `Could not find target layer with ID: ${e.layerId}`;
-  let c;
+  let s;
   if (a) {
-    const p = await K(a, t);
+    const p = await H(a, t);
     if ("error" in p)
       return p.error;
-    c = p.geometry;
+    s = p.geometry;
   }
-  if (s.featureEffect = null, s.featureEffect = new ot({
-    filter: new fe({
+  if (c.featureEffect = null, c.featureEffect = new at({
+    filter: new Se({
       ...e.objectIds?.length ? { objectIds: e.objectIds } : { where: e.where },
-      geometry: c,
+      geometry: s,
       spatialRelationship: "intersects",
       distance: a?.distance,
       units: a?.units
     }),
     includedEffect: r,
     excludedEffect: o
-  }), s.visible = !0, n)
-    return `Applied feature effects to "${s.title ?? e.layerId}" within current map extent.`;
-  const u = e.objectIds?.length ? `${s.objectIdField} IN (${e.objectIds.join(",")})` : e.where, l = await Xr(
+  }), c.visible = !0, n)
+    return `Applied feature effects to "${c.title ?? e.layerId}" within current map extent.`;
+  const l = e.objectIds?.length ? `${c.objectIdField} IN (${e.objectIds.join(",")})` : e.where, u = await eo(
     t,
     e.layerId,
-    u,
-    c,
+    l,
+    s,
     a?.distance,
     a?.units
-  ), d = s.title ?? e.layerId;
-  return l.success ? `Applied feature effects to target layer "${s.title ?? e.layerId}"${a && "layerId" in a ? ` using geometry from layer "${a.layerId}"` : ""}.` : `Applied filter to "${d}" but no features matched. ${l.error}`;
-}, to = ["feet", "kilometers", "meters", "miles", "nautical-miles", "us-nautical-miles"], I = i.enum(to), ro = async ({
+  ), d = c.title ?? e.layerId;
+  return u.success ? `Applied feature effects to target layer "${c.title ?? e.layerId}"${a && "layerId" in a ? ` using geometry from layer "${a.layerId}"` : ""}.` : `Applied filter to "${d}" but no features matched. ${u.error}`;
+}, ro = ["feet", "kilometers", "meters", "miles", "nautical-miles", "us-nautical-miles"], N = i.enum(ro), oo = async ({
   targetLayer: e,
   geometryFilter: t,
   useCurrentExtent: r,
   includedEffect: o = "drop-shadow(2px, 2px, 2px, gray)",
   excludedEffect: a = "grayscale(100%) opacity(60%) blur(2px)"
 }, n) => {
-  const { mapView: s } = N(n);
-  return await eo(e, s, o, a, t, r);
-}, oo = i.object({
+  const { mapView: c } = I(n);
+  return await to(e, c, o, a, t, r);
+}, ao = i.object({
   layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), ao = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), no = i.object({
   point: i.object({
     x: i.number().describe("X coordinate (longitude) from navigation result"),
     y: i.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1380,8 +1380,8 @@ const K = async (e, t) => {
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), no = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), io = i.object({
   targetLayer: i.object({
     layerId: i.string().describe("The layerId of the layer on which to set a feature effect."),
     where: i.string().describe("The SQL-92 where clause representing the features to emphasize."),
@@ -1389,7 +1389,7 @@ const K = async (e, t) => {
       "Array of objectIds from a previous query result. Use this instead of a where clause when the query returned objectIds (e.g. top N results). If provided, takes precedence over where clause."
     )
   }),
-  geometryFilter: i.union([oo, ao]).optional().describe("Optional geometry-based filtering parameters for spatial queries."),
+  geometryFilter: i.union([ao, no]).optional().describe("Optional geometry-based filtering parameters for spatial queries."),
   useCurrentExtent: i.boolean().optional().describe(
     "Set to true when the previous query used the current map extent as a spatial filter. This ensures the feature effect applies only to features visible in the current view. Default is false."
   ),
@@ -1399,11 +1399,11 @@ const K = async (e, t) => {
   excludedEffect: i.string().default("grayscale(100%) opacity(60%) blur(2px)").describe(
     "The effect applied to features that do not meet the filter requirements. Valid effects include: bloom, blur, brightness, contrast, drop-shadow, grayscale, hue-rotate, invert, opacity, saturate, and sepia. Prefer default unless specified."
   )
-}), io = f(ro, {
+}), so = y(oo, {
   name: "setFeatureEffect",
   description: "Sets a feature effect on a given layer with given filter parameters and feature effects to emphasize certain features that meet a filter requirement. If no feature effect information is provided, then use the default effect provided.",
-  schema: no
-}), X = (e) => {
+  schema: io
+}), re = (e) => {
   if (e instanceof Date)
     return Number.isNaN(e.getTime()) ? null : e;
   if (typeof e == "number" && Number.isFinite(e)) {
@@ -1411,44 +1411,44 @@ const K = async (e, t) => {
     return Number.isNaN(t.getTime()) ? null : t;
   }
   return null;
-}, so = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, co = (e) => {
+}, co = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, lo = (e) => {
   if (typeof e == "string" && e)
     return e;
-  const t = X(e);
+  const t = re(e);
   return t ? t.toISOString().slice(0, 10) : null;
-}, Wn = () => {
+}, Vn = () => {
   const e = (/* @__PURE__ */ new Date()).getTimezoneOffset(), t = e <= 0 ? "+" : "-", r = Math.floor(Math.abs(e) / 60).toString().padStart(2, "0"), o = (Math.abs(e) % 60).toString().padStart(2, "0"), a = `${t}${r}:${o}`;
   return { userTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone, userTimezoneOffset: a };
-}, lo = (e, t, r) => {
+}, uo = (e, t, r) => {
   const o = t?.toLowerCase();
   if (o === "date-only") {
-    const n = co(e);
-    return n ? nt(n, M("short-date")) : e;
+    const n = lo(e);
+    return n ? it(n, Q("short-date")) : e;
   }
   if (o === "time-only") {
     if (typeof e == "string" && e)
-      return it(e, M("long-time"));
-    const n = X(e);
-    return n ? de(n, {
-      ...M("long-time"),
+      return st(e, Q("long-time"));
+    const n = re(e);
+    return n ? fe(n, {
+      ...Q("long-time"),
       timeZone: "UTC"
     }) : e;
   }
-  const a = X(e);
-  return a ? de(a, {
-    ...M("short-date-short-time"),
-    timeZone: so(r)
+  const a = re(e);
+  return a ? fe(a, {
+    ...Q("short-date-short-time"),
+    timeZone: co(r)
   }) : e;
-}, be = (e, t, r) => {
+}, Re = (e, t, r) => {
   if (e && typeof e != "function") {
     const o = "getField" in r && r.getField?.(e), a = o && "getFieldDomain" in r && r.getFieldDomain ? r.getFieldDomain(o.name) : null;
     if (a?.type === "coded-value") {
-      const s = a.codedValues.find((c) => c.code === t);
-      return s ? s.name : null;
+      const c = a.codedValues.find((s) => s.code === t);
+      return c ? c.name : null;
     }
   }
   return null;
-}, uo = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, po = (e) => {
+}, po = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, mo = (e) => {
   if (e instanceof Date)
     return Number.isNaN(e.getTime()) ? null : e;
   if (typeof e == "number" && Number.isFinite(e)) {
@@ -1470,184 +1470,184 @@ const K = async (e, t) => {
   } catch {
     return e;
   }
-}, mo = (e, t, r) => {
-  const o = po(e);
+}, yo = (e, t, r) => {
+  const o = mo(e);
   if (!o)
     return e;
   const a = {};
-  t.dateStyle ? a.dateStyle = t.dateStyle : (t.year && (a.year = t.year), t.month && (a.month = t.month)), t.timeStyle && (a.timeStyle = t.timeStyle), t.timeStyle && t.hour12 === "always" ? a.hour12 = !0 : t.timeStyle && t.hour12 === "never" && (a.hour12 = !1), a.timeZone = uo(r);
+  t.dateStyle ? a.dateStyle = t.dateStyle : (t.year && (a.year = t.year), t.month && (a.month = t.month)), t.timeStyle && (a.timeStyle = t.timeStyle), t.timeStyle && t.hour12 === "always" ? a.hour12 = !0 : t.timeStyle && t.hour12 === "never" && (a.hour12 = !1), a.timeZone = po(r);
   try {
     return new Intl.DateTimeFormat(void 0, a).format(o);
   } catch {
     return e;
   }
-}, Te = (e, t) => e.getFieldAlias?.(t) ?? e.fieldsIndex?.get(t)?.alias ?? e.fieldsIndex?.get(t)?.name ?? t, ve = (e, t, r, o, a) => {
+}, $e = (e, t) => e.getFieldAlias?.(t) ?? e.fieldsIndex?.get(t)?.alias ?? e.fieldsIndex?.get(t)?.name ?? t, Ce = (e, t, r, o, a) => {
   if (r == null)
     return r;
-  const s = e.getFieldConfiguration?.(t)?.fieldFormat;
-  return s?.type === "number" ? ho(r, s) : s?.type === "date-time" ? mo(r, s, a) : lo(r, o, a);
-}, yo = (e, t, r, o) => {
-  const a = e.fieldsIndex?.get(t), n = be(t, r, e) ?? r;
-  return ve(e, t, n, a?.type, o);
-}, fo = (e, t) => Te(e, t), Se = (e, t, r) => {
+  const c = e.getFieldConfiguration?.(t)?.fieldFormat;
+  return c?.type === "number" ? ho(r, c) : c?.type === "date-time" ? yo(r, c, a) : uo(r, o, a);
+}, fo = (e, t, r, o) => {
+  const a = e.fieldsIndex?.get(t), n = Re(t, r, e) ?? r;
+  return Ce(e, t, n, a?.type, o);
+}, go = (e, t) => $e(e, t), Ee = (e, t, r) => {
   const o = e.objectIdField, a = t.features.map(
-    (s) => s.attributes[o]
-  ), n = t.features.map((s) => {
-    const c = s.attributes, u = {};
-    return e.fields.forEach((l) => {
-      if (!Object.hasOwn(c, l.name))
+    (c) => c.attributes[o]
+  ), n = t.features.map((c) => {
+    const s = c.attributes, l = {};
+    return e.fields.forEach((u) => {
+      if (!Object.hasOwn(s, u.name))
         return;
-      const d = c[l.name];
-      if (l.name === o) {
-        u[l.name] = d;
+      const d = s[u.name];
+      if (u.name === o) {
+        l[u.name] = d;
         return;
       }
-      const p = be(l.name, d, e) ?? d, h = Te(e, l.name);
-      u[h] = ve(e, l.name, p, l.type, r);
-    }), u;
+      const p = Re(u.name, d, e) ?? d, m = $e(e, u.name);
+      l[m] = Ce(e, u.name, p, u.type, r);
+    }), l;
   });
   return { objectIds: a, attributes: n };
-}, go = (e, t, r) => {
+}, wo = (e, t, r) => {
   const o = e.createQuery();
   return o.outFields = [t], o.where = r || "1=1", o.num = 1, o;
-}, wo = async (e, t, r, o) => {
-  const a = o.map?.allLayers.find((h) => h.id === e), n = go(a, t, r.where), c = (await a.queryFeatures(n)).features[0], u = c ? c.attributes[t] : null, l = yo(a, t, u, o.timeZone), d = fo(a, t);
+}, bo = async (e, t, r, o) => {
+  const a = o.map?.allLayers.find((m) => m.id === e), n = wo(a, t, r.where), s = (await a.queryFeatures(n)).features[0], l = s ? s.attributes[t] : null, u = fo(a, t, l, o.timeZone), d = go(a, t);
   return {
     tool: "getAttribute",
     layerName: a.title ?? e,
-    summary: `${d} = ${l}`,
+    summary: `${d} = ${u}`,
     details: {
       fieldName: t,
       fieldAlias: d !== t ? d : void 0,
-      value: l,
+      value: u,
       where: r.where
     }
   };
 };
-async function bo({ layerId: e, fieldName: t, query: r }, o) {
-  const { mapView: a } = N(o), n = await wo(e, t, r, a);
+async function To({ layerId: e, fieldName: t, query: r }, o) {
+  const { mapView: a } = I(o), n = await bo(e, t, r, a);
   return JSON.stringify(n, null, 2);
 }
-const To = i.object({
+const So = i.object({
   layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
   fieldName: i.string().describe("The name of the field/attribute from which to get a field value."),
   query: i.object({
     where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
   })
-}), vo = f(bo, {
+}), vo = y(To, {
   name: "getAttribute",
   description: "Returns an attribute value for a given feature.",
-  schema: To
-}), oe = (e, t, r) => r ? e.hasAllFeaturesInView && e.availableFields === t : e.hasAllFeatures && e.availableFields === t;
-function V(e, t) {
+  schema: So
+}), le = (e, t, r) => r ? e.hasAllFeaturesInView && e.availableFields === t : e.hasAllFeatures && e.availableFields === t;
+function K(e, t) {
   let r = e ?? "";
   return t != null && t && (r = r ? `(${r}) AND (${t})` : t), r || null;
 }
-const So = async (e) => {
-  const { targetLayer: t, fieldName: r, statisticType: o, mapView: a, layersAndFieldsRegistry: n, geometryFilter: s } = e, c = a.map?.allLayers.find((v) => v.id === t.layerId);
-  if (!c)
+const xo = async (e) => {
+  const { targetLayer: t, fieldName: r, statisticType: o, mapView: a, layersAndFieldsRegistry: n, geometryFilter: c } = e, s = a.map?.allLayers.find((S) => S.id === t.layerId);
+  if (!s)
     throw new Error(`Layer '${t.layerId}' not found.`);
-  const u = await a.whenLayerView(c), d = n.get(t.layerId)?.fieldRegistry.get(r), p = d?.alias;
+  const l = await a.whenLayerView(s), d = n.get(t.layerId)?.fieldRegistry.get(r), p = d?.alias;
   if (!d)
     throw new Error(`Field '${r}' not found.`);
-  let h, m;
-  if (s) {
-    const v = await K(s, a);
-    if ("error" in v)
-      throw new Error(v.error);
-    if (!v.geometry)
-      throw P(s) ? new Error(`No features found matching: ${s.where}`) : new Error("Failed to create geometry");
-    if (P(s)) {
-      const O = a.map?.allLayers.find((A) => A.id === s.layerId);
-      h = {
-        geometryLayerName: O?.title ?? O?.id,
-        geometryLayerId: s.layerId,
-        geometryWhere: s.where,
-        distance: s.distance,
-        units: s.units,
+  let m, f;
+  if (c) {
+    const S = await H(c, a);
+    if ("error" in S)
+      throw new Error(S.error);
+    if (!S.geometry)
+      throw j(c) ? new Error(`No features found matching: ${c.where}`) : new Error("Failed to create geometry");
+    if (j(c)) {
+      const M = a.map?.allLayers.find((L) => L.id === c.layerId);
+      m = {
+        geometryLayerName: M?.title ?? M?.id,
+        geometryLayerId: c.layerId,
+        geometryWhere: c.where,
+        distance: c.distance,
+        units: c.units,
         applied: !0
       };
-    } else W(s) && (h = {
-      point: s.point,
-      distance: s.distance,
-      units: s.units,
+    } else U(c) && (m = {
+      point: c.point,
+      distance: c.distance,
+      units: c.units,
       applied: !0
     });
-    m = new fe({
-      geometry: v.geometry,
-      distance: s.distance,
-      units: s.units,
+    f = new Se({
+      geometry: S.geometry,
+      distance: c.distance,
+      units: c.units,
       spatialRelationship: "intersects"
     });
   }
-  const w = oe(u, [r], !1);
-  let y = null, g = null;
+  const g = le(l, [r], !1);
+  let h = null, w = null;
   const T = 10;
   if (d.type !== "geometry" && d.type !== "oid" && d.type !== "global-id")
     try {
-      const v = {
-        layer: c,
-        useFeaturesInView: w,
-        view: w ? a : void 0,
+      const S = {
+        layer: s,
+        useFeaturesInView: g,
+        view: g ? a : void 0,
         field: r,
-        sqlWhere: V(c.definitionExpression, t.where),
-        ...m && { filter: m },
+        sqlWhere: K(s.definitionExpression, t.where),
+        ...f && { filter: f },
         outStatisticTypes: { include: [o] }
       };
-      y = await st(v);
-      const O = ["string", "small-integer", "integer"], A = d.domain?.type === "coded-value" ? d.domain : null;
-      (O.includes(d.type) || A) && (g = (await ct({
-        layer: c,
-        useFeaturesInView: w,
-        view: w ? a : void 0,
+      h = await ct(S);
+      const M = ["string", "small-integer", "integer"], L = d.domain?.type === "coded-value" ? d.domain : null;
+      (M.includes(d.type) || L) && (w = (await lt({
+        layer: s,
+        useFeaturesInView: g,
+        view: g ? a : void 0,
         field: r,
-        sqlWhere: V(c.definitionExpression, t.where),
-        ...m && { filter: m }
-      })).uniqueValueInfos.sort((q, ke) => ke.count - q.count).slice(0, T)), g && d.domain?.type === "coded-value" && (g = g.map((q) => ({
-        ...q,
-        value: A ? A.getName(q.value) ?? q.value : q.value
+        sqlWhere: K(s.definitionExpression, t.where),
+        ...f && { filter: f }
+      })).uniqueValueInfos.sort((z, ke) => ke.count - z.count).slice(0, T)), w && d.domain?.type === "coded-value" && (w = w.map((z) => ({
+        ...z,
+        value: L ? L.getName(z.value) ?? z.value : z.value
       })));
-    } catch (v) {
-      console.error("Statistics error:", v);
+    } catch (S) {
+      console.error("Statistics error:", S);
     }
   return {
     tool: "getStatistics",
-    layerName: c.title ?? t.layerId,
-    summary: `${o} = ${typeof y?.[o] == "number" ? y[o] : "N/A"}`,
+    layerName: s.title ?? t.layerId,
+    summary: `${o} = ${typeof h?.[o] == "number" ? h[o] : "N/A"}`,
     details: {
       fieldName: r,
       fieldAlias: p,
       statisticType: o,
-      statistic: y?.[o] ?? null,
-      summaryStatistics: y,
-      uniqueValues: g,
+      statistic: h?.[o] ?? null,
+      summaryStatistics: h,
+      uniqueValues: w,
       where: t.where,
-      spatialFilterInfo: h
+      spatialFilterInfo: m
     }
   };
 };
-async function xo({
+async function Ro({
   targetLayer: e,
   fieldName: t,
   statisticType: r,
   geometryFilter: o
 }, a) {
-  const n = we(a, "layersAndFieldsRegistry"), { mapView: s } = N(a), c = await So({
+  const n = xe(a, "layersAndFieldsRegistry"), { mapView: c } = I(a), s = await xo({
     targetLayer: e,
     fieldName: t,
     statisticType: r,
-    mapView: s,
+    mapView: c,
     layersAndFieldsRegistry: n,
     geometryFilter: o
   });
-  return JSON.stringify(c, null, 2);
+  return JSON.stringify(s, null, 2);
 }
-const Ro = i.object({
+const $o = i.object({
   layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), $o = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), Co = i.object({
   point: i.object({
     x: i.number().describe("X coordinate (longitude) from navigation result"),
     y: i.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1656,18 +1656,18 @@ const Ro = i.object({
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
+  units: N.optional().describe("The units for the distance buffer.")
 }), Eo = i.object({
   targetLayer: i.object({
     layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
     where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
   }),
-  geometryFilter: i.union([Ro, $o]).optional().describe(
+  geometryFilter: i.union([$o, Co]).optional().describe(
     "Geometry filter for spatial queries. Use 'point' option with x/y coordinates from navigation results to find features at that location (point-in-polygon). Use 'layerId/where' option to filter by features from another layer."
   ),
   fieldName: i.string().describe("The name of the field for which to get statistics. STRICTLY DO NOT use OBJECTID. Use any other field"),
   statisticType: i.enum(["avg", "max", "median", "min", "stddev", "sum", "variance", "nullcount", "count"]).describe("The statistic type to calculate.")
-}), Co = f(xo, {
+}), No = y(Ro, {
   name: "getStatistics",
   description: `Computes a single aggregate statistic (max, min, avg, sum, median, stddev, variance) for a numeric field across matching features. Also returns frequency analysis for categorical fields.
 
@@ -1683,95 +1683,95 @@ DO NOT USE FOR:
 
 Only call this tool when the answer requires computing an aggregate (avg, max, min, sum, median, stddev) over a field's values, not just counting or listing features.`,
   schema: Eo
-}), Io = async (e, t, r, o, a) => {
-  const n = r.map?.allLayers.find((h) => h.id === e.layerId), s = await r.whenLayerView(n), c = n.title ?? e.layerId;
-  let u;
+}), Fo = async (e, t, r, o, a) => {
+  const n = r.map?.allLayers.find((m) => m.id === e.layerId), c = await r.whenLayerView(n), s = n.title ?? e.layerId;
+  let l;
   if (o) {
-    const h = await K(o, r);
-    if ("error" in h)
+    const m = await H(o, r);
+    if ("error" in m)
       return {
         tool: "getTopFeatures",
-        layerName: c,
+        layerName: s,
         summary: "Geometry lookup failed",
-        details: { error: h.error }
+        details: { error: m.error }
       };
-    if (!h.geometry)
+    if (!m.geometry)
       return {
         tool: "getTopFeatures",
-        layerName: c,
+        layerName: s,
         summary: "No features found for geometry filter",
         details: {
           error: `No features found matching: ${"where" in o ? o.where : "unknown criteria"}`
         }
       };
-    u = h.geometry;
-  } else a && (u = r.extent.clone());
-  const l = t.groupByFields && t.groupByFields.length > 0, d = n.objectIdField, p = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, d])];
+    l = m.geometry;
+  } else a && (l = r.extent.clone());
+  const u = t.groupByFields && t.groupByFields.length > 0, d = n.objectIdField, p = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, d])];
   try {
-    let h;
-    if (l) {
-      const y = new lt({
+    let m;
+    if (u) {
+      const h = new ut({
         where: e.where || "1=1",
         outFields: p,
         orderByFields: e.orderByFields,
-        geometry: u,
-        spatialRelationship: u ? "intersects" : void 0,
+        geometry: l,
+        spatialRelationship: l ? "intersects" : void 0,
         distance: o?.distance,
         units: o?.units,
-        topFilter: new ut({
+        topFilter: new dt({
           topCount: t.topCount,
           groupByFields: t.groupByFields,
           orderByFields: t.orderByFields
         })
       });
-      h = await n.queryTopFeatures(y);
+      m = await n.queryTopFeatures(h);
     } else {
-      const y = n.createQuery();
-      y.where = V(n.definitionExpression, e.where || "1=1"), y.outFields = p.length ? p : ["*"], y.orderByFields = t.orderByFields, y.num = t.topCount, u && (y.geometry = u, y.spatialRelationship = "intersects"), o?.distance && (y.distance = o.distance), o?.units && (y.units = o.units), y.outSpatialReference = r.spatialReference;
-      const g = oe(s, e.outFields, a ?? !1);
+      const h = n.createQuery();
+      h.where = K(n.definitionExpression, e.where || "1=1"), h.outFields = p.length ? p : ["*"], h.orderByFields = t.orderByFields, h.num = t.topCount, l && (h.geometry = l, h.spatialRelationship = "intersects"), o?.distance && (h.distance = o.distance), o?.units && (h.units = o.units), h.outSpatialReference = r.spatialReference;
+      const w = le(c, e.outFields, a ?? !1);
       try {
-        h = g ? await s.queryFeatures(y) : await n.queryFeatures(y);
+        m = w ? await c.queryFeatures(h) : await n.queryFeatures(h);
       } catch (T) {
-        console.warn("Client-side query failed, falling back to server:", T), h = await n.queryFeatures(y);
+        console.warn("Client-side query failed, falling back to server:", T), m = await n.queryFeatures(h);
       }
     }
-    const m = h.features.map((y) => y.attributes[d]), { attributes: w } = Se(n, h, r.timeZone);
+    const f = m.features.map((h) => h.attributes[d]), { attributes: g } = Ee(n, m, r.timeZone);
     return {
       tool: "getTopFeatures",
-      layerName: c,
+      layerName: s,
       summary: `Top ${t.topCount} features extracted`,
       details: {
         topCount: t.topCount,
-        attributes: w,
-        objectIds: m,
+        attributes: g,
+        objectIds: f,
         objectIdField: d,
         where: e.where,
         orderByFields: t.orderByFields,
-        ...l && { groupByFields: t.groupByFields }
+        ...u && { groupByFields: t.groupByFields }
       }
     };
-  } catch (h) {
+  } catch (m) {
     return {
       tool: "getTopFeatures",
-      layerName: c,
+      layerName: s,
       summary: "Query failed",
-      details: { error: h instanceof Error ? h.message : String(h) }
+      details: { error: m instanceof Error ? m.message : String(m) }
     };
   }
-}, Fo = async ({
+}, Io = async ({
   targetLayer: e,
   topFilter: t,
   geometryFilter: r,
   useCurrentExtent: o
 }, a) => {
-  const { mapView: n } = N(a), s = await Io(e, t, n, r, o);
-  return JSON.stringify(s, null, 2);
+  const { mapView: n } = I(a), c = await Fo(e, t, n, r, o);
+  return JSON.stringify(c, null, 2);
 }, ko = i.object({
   layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), No = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), zo = i.object({
   point: i.object({
     x: i.number().describe("X coordinate (longitude) from navigation result"),
     y: i.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1780,8 +1780,8 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), zo = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), qo = i.object({
   targetLayer: i.object({
     layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
     where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value."),
@@ -1792,7 +1792,7 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
       ).default("*")
     )
   }),
-  geometryFilter: i.union([ko, No]).optional().describe(
+  geometryFilter: i.union([ko, zo]).optional().describe(
     "Geometry filter for spatial queries. Use 'point' option with x/y coordinates from navigation results to find features at that location (point-in-polygon). Use 'layerId/where' option to filter by features from another layer."
   ),
   topFilter: i.object({
@@ -1805,83 +1805,83 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
   useCurrentExtent: i.boolean().optional().describe(
     "Set to true ONLY when user explicitly asks about features 'in my view', 'on my map', 'I am looking at'. Default is false (queries entire layer)."
   )
-}), qo = f(Fo, {
+}), Ao = y(Io, {
   name: "getTopFeatures",
   description: 'Returns top N features ranked by an existing field value. Use for "highest", "lowest", "top N" questions where ranking is based on a field that already exists in the data (e.g., population, value, date, depth). orderByFields must be actual field names with ASC/DESC. Do NOT use aggregate functions like COUNT(), SUM(), AVG() - those require getStatistics.',
-  schema: zo
-}), Z = 25, Do = async (e, t, r, o) => {
-  const a = t.map?.allLayers.find((y) => y.id === e.layerId), n = await t.whenLayerView(a), s = a.title ?? e.layerId;
-  let c;
+  schema: qo
+}), ee = 25, Do = async (e, t, r, o) => {
+  const a = t.map?.allLayers.find((h) => h.id === e.layerId), n = await t.whenLayerView(a), c = a.title ?? e.layerId;
+  let s;
   if (r) {
-    const y = await K(r, t);
-    if ("error" in y) {
-      const g = { error: y.error };
-      if (P(r)) {
-        const T = t.map?.allLayers.find((E) => E.id === r.layerId);
-        g.geometryLayerName = T?.title ?? T?.id, g.geometryLayerId = r.layerId, g.geometryWhere = r.where;
-      } else W(r) && (g.point = r.point);
+    const h = await H(r, t);
+    if ("error" in h) {
+      const w = { error: h.error };
+      if (j(r)) {
+        const T = t.map?.allLayers.find((C) => C.id === r.layerId);
+        w.geometryLayerName = T?.title ?? T?.id, w.geometryLayerId = r.layerId, w.geometryWhere = r.where;
+      } else U(r) && (w.point = r.point);
       return {
         tool: "queryFeatures",
-        layerName: s,
+        layerName: c,
         summary: "Geometry lookup failed",
-        details: g
+        details: w
       };
     }
-    if (!y.geometry) {
-      const g = {};
-      if (P(r)) {
-        const T = t.map?.allLayers.find((E) => E.id === r.layerId);
-        g.error = `No features found matching: ${r.where}`, g.geometryLayerName = T?.title ?? T?.id, g.geometryLayerId = r.layerId, g.geometryWhere = r.where;
-      } else W(r) && (g.error = "Failed to create point geometry", g.point = r.point);
+    if (!h.geometry) {
+      const w = {};
+      if (j(r)) {
+        const T = t.map?.allLayers.find((C) => C.id === r.layerId);
+        w.error = `No features found matching: ${r.where}`, w.geometryLayerName = T?.title ?? T?.id, w.geometryLayerId = r.layerId, w.geometryWhere = r.where;
+      } else U(r) && (w.error = "Failed to create point geometry", w.point = r.point);
       return {
         tool: "queryFeatures",
-        layerName: s,
+        layerName: c,
         summary: "No features found for geometry filter",
-        details: g
+        details: w
       };
     }
-    c = y.geometry;
-  } else o && (c = t.extent.clone());
-  const u = oe(n, e.outFields, o ?? !1), l = a.objectIdField, d = a.createQuery();
-  d.where = V(a.definitionExpression, e.where || "1=1"), d.outFields = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, l])], d.orderByFields = e.orderByFields, c && (d.geometry = c, d.spatialRelationship = "intersects"), r?.distance && (d.distance = r.distance), r?.units && (d.units = r.units), d.outSpatialReference = t.spatialReference;
-  let p, h;
+    s = h.geometry;
+  } else o && (s = t.extent.clone());
+  const l = le(n, e.outFields, o ?? !1), u = a.objectIdField, d = a.createQuery();
+  d.where = K(a.definitionExpression, e.where || "1=1"), d.outFields = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, u])], d.orderByFields = e.orderByFields, s && (d.geometry = s, d.spatialRelationship = "intersects"), r?.distance && (d.distance = r.distance), r?.units && (d.units = r.units), d.outSpatialReference = t.spatialReference;
+  let p, m;
   try {
-    p = u ? await n.queryFeatureCount(d) : await a.queryFeatureCount(d), p > 0 && p <= Z && (h = u ? await n.queryFeatures(d) : await a.queryFeatures(d));
-  } catch (y) {
-    console.warn("Client-side query failed, falling back to server:", y), p = await a.queryFeatureCount(d), p > 0 && p <= Z && (h = await a.queryFeatures(d));
+    p = l ? await n.queryFeatureCount(d) : await a.queryFeatureCount(d), p > 0 && p <= ee && (m = l ? await n.queryFeatures(d) : await a.queryFeatures(d));
+  } catch (h) {
+    console.warn("Client-side query failed, falling back to server:", h), p = await a.queryFeatureCount(d), p > 0 && p <= ee && (m = await a.queryFeatures(d));
   }
-  const { objectIds: m, attributes: w } = h ? Se(a, h, t.timeZone) : { objectIds: void 0, attributes: void 0 };
+  const { objectIds: f, attributes: g } = m ? Ee(a, m, t.timeZone) : { objectIds: void 0, attributes: void 0 };
   return {
     tool: "queryFeatures",
-    layerName: s,
+    layerName: c,
     summary: `${p} features found`,
     details: {
       totalCount: p,
       where: e.where,
       orderByFields: e.orderByFields,
       outFields: e.outFields,
-      ...m && { objectIds: m, objectIdField: l },
-      ...w && { attributes: w },
-      ...p > Z && {
+      ...f && { objectIds: f, objectIdField: u },
+      ...g && { attributes: g },
+      ...p > ee && {
         note: `${p} features found.`
       }
     }
   };
 };
-async function Ao({
+async function Lo({
   targetLayer: e,
   geometryFilter: t,
   useCurrentExtent: r
 }, o) {
-  const { mapView: a } = N(o), n = await Do(e, a, t, r);
+  const { mapView: a } = I(o), n = await Do(e, a, t, r);
   return JSON.stringify(n, null, 2);
 }
-const Lo = i.object({
+const Po = i.object({
   layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), Po = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), jo = i.object({
   point: i.object({
     x: i.number().describe("X coordinate (longitude) from navigation result"),
     y: i.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1890,8 +1890,8 @@ const Lo = i.object({
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), jo = i.object({
+  units: N.optional().describe("The units for the distance buffer.")
+}), Go = i.object({
   targetLayer: i.object({
     layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
     where: i.string().describe(
@@ -1904,13 +1904,13 @@ const Lo = i.object({
       ).default("*")
     )
   }),
-  geometryFilter: i.union([Lo, Po]).optional().describe(
+  geometryFilter: i.union([Po, jo]).optional().describe(
     "Geometry filter for spatial queries. Use 'point' option with x/y coordinates from navigation results to find features at that location (point-in-polygon). Use 'layerId/where' option to filter by features from another layer."
   ),
   useCurrentExtent: i.boolean().optional().describe(
     "Set to true ONLY when user explicitly asks about features 'in my view', 'on my map', 'I am looking at', OR when the user refers back to features previously identified using the current extent (e.g. 'these', 'those', 'them', 'the same ones'). Default is false (queries entire layer)."
   )
-}), Go = f(Ao, {
+}), Oo = y(Lo, {
   name: "queryFeatures",
   description: `Queries features from a layer. Returns the total count of matching features, plus individual feature attributes if ≤25 features match. 
 
@@ -1922,62 +1922,62 @@ USE THIS TOOL FOR:
 - Any question where the user wants to SEE or COUNT matching features
 
 This is the DEFAULT tool for most queries. When in doubt, use this tool.`,
-  schema: jo
-}), Oo = [vo, Co, qo, Go], Vn = [io, Yr, Hr], Mo = new rt(Oo);
-async function Un(e, t) {
-  const { messages: r } = await Mo.invoke({ messages: e.dataExplorationMessages }, t), o = [], a = [];
+  schema: Go
+}), Mo = [vo, No, Ao, Oo], Un = [so, Xr, Jr], Qo = new ot(Mo);
+async function Kn(e, t) {
+  const { messages: r } = await Qo.invoke({ messages: e.dataExplorationMessages }, t), o = [], a = [];
   for (const n of r) {
-    const s = n.content;
-    let c;
-    typeof s != "string" && (c = {
+    const c = n.content;
+    let s;
+    typeof c != "string" && (s = {
       tool: n.name ?? "unknown",
       layerName: "unknown",
       summary: "Query failed",
-      details: { error: "Skipping non-string tool output:", raw: s }
+      details: { error: "Skipping non-string tool output:", raw: c }
     });
     try {
-      typeof s == "string" ? c = JSON.parse(s) : c = {
+      typeof c == "string" ? s = JSON.parse(c) : s = {
         tool: n.name ?? "unknown",
         layerName: "unknown",
         summary: "Query failed",
-        details: { error: "Invalid tool output type", raw: s }
+        details: { error: "Invalid tool output type", raw: c }
       };
     } catch {
-      c = {
+      s = {
         tool: n.name ?? "unknown",
         layerName: "unknown",
         summary: "Query failed",
-        details: { error: s }
+        details: { error: c }
       };
     }
-    o.push(c), c.details && typeof c.details == "object" && "error" in c.details ? a.push(`- ${c.tool}: Error - ${String(c.details.error)}`) : a.push(`- ${c.layerName}: ${c.summary}`);
+    o.push(s), s.details && typeof s.details == "object" && "error" in s.details ? a.push(`- ${s.tool}: Error - ${String(s.details.error)}`) : a.push(`- ${s.layerName}: ${s.summary}`);
   }
-  return await S({ text: `Finished executing layer query tool: ${a.join(", ")}` }, t), {
+  return await v({ text: `Finished executing layer query tool: ${a.join(", ")}` }, t), {
     ...e,
     dataExplorationMessages: [...e.dataExplorationMessages, ...r],
     queryResponse: o,
     status: "success",
     outputMessage: a.join(`
 `),
-    summary: a.length > 0 ? _t(a.join(`
+    summary: a.length > 0 ? Wt(a.join(`
 `)) : "Query executed."
   };
 }
-const Kn = b.Root({
-  ...U(),
+const Bn = b.Root({
+  ...B(),
   // internal to the help agent
   helpInternalState: b({
-    reducer: L,
+    reducer: P,
     default: () => ({
       toolCallMessage: void 0
     })
   })
-}), Qo = (e, t) => {
+}), _o = (e, t) => {
   const r = Array.from(e.values()).find(
     ({ layerItem: n }) => n.title?.toLowerCase().includes(t.toLowerCase())
   );
   if (!r) {
-    const n = Array.from(e.values()).map((s) => s.layerItem.title).join(", ");
+    const n = Array.from(e.values()).map((c) => c.layerItem.title).join(", ");
     return `Could not find a layer matching "${t}". Available layers: ${n}`;
   }
   const o = Array.from(r.fieldRegistry.values()), a = o.map((n) => `- **${n.alias || n.name}** (\`${n.name}\`, ${n.type})${n.description ? `: ${n.description}` : ""}`).join(`
@@ -1985,63 +1985,63 @@ const Kn = b.Root({
   return `**${r.layerItem.title}** has ${o.length} field(s):
 
 ${a}`;
-}, _o = async ({ layerTitle: e }, t) => {
-  const r = we(t, "layersAndFieldsRegistry");
-  return Qo(r, e);
-}, Bn = f(_o, {
+}, Wo = async ({ layerTitle: e }, t) => {
+  const r = xe(t, "layersAndFieldsRegistry");
+  return _o(r, e);
+}, Hn = y(Wo, {
   name: "listLayerFields",
   description: "Lists all fields for a given layer by title. Use ONLY when the user explicitly asks to see fields, columns, or attributes of a specific named layer. Do NOT call this tool for general help questions, capability overviews, or layer listing.",
   schema: i.object({
     layerTitle: i.string().describe("The title or partial title of the layer to list fields for.")
   })
-}), Hn = b.Root({
-  ...U(),
+}), Jn = b.Root({
+  ...B(),
   intent: b({
     reducer: (e, t) => t
   }),
   arcgisKnowledgeMessages: b({
-    reducer: me,
+    reducer: be,
     default: () => []
   }),
   arcgisKnowledgeToolResult: b({
     reducer: (e, t) => t,
     default: () => null
   })
-}), Q = {
+}), _ = {
   conversationId: ""
 };
-function ae(e) {
+function ue(e) {
   const t = e.map?.allLayers.filter((r) => r.type === "knowledge-graph");
   if (!t || t?.length !== 1)
     throw new Error("The Knowledge Agent currently only supports maps with exactly one Knowledge Graph Layer.");
 }
-function z(e) {
+function k(e) {
   return !!e?.map && !("activeLinkChartLayer" in e.map);
 }
-async function B(e) {
-  !e || z(e) || !e.map?.diagramNodesExtent || await e.goTo(e.map.diagramNodesExtent);
+async function J(e) {
+  !e || k(e) || !e.map?.diagramNodesExtent || await e.goTo(e.map.diagramNodesExtent);
 }
-function H(e) {
+function Z(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
   if (!("view" in r))
     throw new Error("View context missing");
   const o = r.view;
-  return o.map && !("activeLinkChartLayer" in o.map) && ae(o), {
+  return o.map && !("activeLinkChartLayer" in o.map) && ue(o), {
     view: o
   };
 }
-function Jn(e) {
+function Zn(e) {
   const r = e?.configurable?.context;
-  if (xe(e) === "knowledgeGraph")
+  if (Ne(e) === "knowledgeGraph")
     return "knowledgeGraph";
   const a = r.view;
-  return z(a) ? (ae(a), "map") : "linkChart";
+  return k(a) ? (ue(a), "map") : "linkChart";
 }
-async function G(e) {
+async function O(e) {
   const r = e?.configurable?.context;
-  if (xe(e) === "knowledgeGraph")
+  if (Ne(e) === "knowledgeGraph")
     return r;
   {
     const a = r.view.map;
@@ -2050,22 +2050,22 @@ async function G(e) {
       if (!n)
         throw new Error("Knowledge graph url missing from link chart.");
       return {
-        knowledgeGraph: await pe(n)
+        knowledgeGraph: await ge(n)
       };
     } else {
-      ae(r.view);
-      const s = (r.view.map?.allLayers.find(
-        (u) => u.type === "knowledge-graph"
+      ue(r.view);
+      const c = (r.view.map?.allLayers.find(
+        (l) => l.type === "knowledge-graph"
       )).url;
-      if (!s)
+      if (!c)
         throw new Error("Knowledge graph url missing from map.");
       return {
-        knowledgeGraph: await pe(s)
+        knowledgeGraph: await ge(c)
       };
     }
   }
 }
-function xe(e) {
+function Ne(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
@@ -2077,12 +2077,12 @@ function xe(e) {
     return "view";
   throw new Error("ArcgisKnowledgeAgent context must have either a view or knowledgeGraph property.");
 }
-class Wo {
+class Vo {
   constructor(t) {
-    this.dataModel = t, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = ne.fromDataModel(t);
+    this.dataModel = t, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = de.fromDataModel(t);
   }
 }
-class ne {
+class de {
   constructor() {
     this.schemaType = "ArcgisGraphSchema", this.entityTypes = [], this.relationshipTypes = [], this.identifierInfo = {
       mappingInfo: {
@@ -2092,14 +2092,14 @@ class ne {
     };
   }
   static fromDataModel(t) {
-    const r = new ne();
+    const r = new de();
     for (const o of t.entityTypes)
-      r.entityTypes.push(j.fromEntityType(o));
+      r.entityTypes.push(G.fromEntityType(o));
     for (const o of t.relationshipTypes)
-      r.relationshipTypes.push(Vo.fromRelationshipType(o));
+      r.relationshipTypes.push(Uo.fromRelationshipType(o));
     return r.identifierInfo = {
       mappingInfo: {
-        identifierMapsTo: Uo(
+        identifierMapsTo: Ko(
           t.identifierInfo.identifierMappingInfo.identifierInfoType
         ),
         identifierPropertyName: t.identifierInfo.identifierMappingInfo.uniformPropertyIdentifier.identifierPropertyName
@@ -2113,19 +2113,19 @@ class ne {
  Relationship Types: ${o}.`;
   }
 }
-class j {
+class G {
   constructor() {
     this.name = "", this.properties = [];
   }
   static fromEntityType(t) {
-    const r = new j();
-    r.name = t.name, r.alias = t.alias ? t.alias : void 0, r.role = Ko(t.role);
+    const r = new G();
+    r.name = t.name, r.alias = t.alias ? t.alias : void 0, r.role = Bo(t.role);
     for (const o of t.properties) {
       const a = {
         name: o.name,
         alias: o.alias ? o.alias : void 0,
         fieldType: o.fieldType,
-        role: Bo(o.role),
+        role: Ho(o.role),
         geometryDef: o.fieldType === "esriFieldTypeGeometry" ? {
           geometryType: o.geometryType ?? "esriGeometryAny",
           hasM: o.hasM ? o.hasM : void 0,
@@ -2137,12 +2137,12 @@ class j {
     return r;
   }
 }
-class Vo extends j {
+class Uo extends G {
   constructor() {
     super(...arguments), this.observedEndPoints = [];
   }
   static fromRelationshipType(t) {
-    const r = j.fromEntityType(t);
+    const r = G.fromEntityType(t);
     r.observedEndPoints = [];
     for (const o of t.endPoints)
       r.observedEndPoints.push({
@@ -2152,7 +2152,7 @@ class Vo extends j {
     return r;
   }
 }
-const Uo = (e) => {
+const Ko = (e) => {
   switch (e) {
     case "esriIdentifierInfoTypeUNSPECIFIED":
       return "UNSPECIFIED";
@@ -2163,7 +2163,7 @@ const Uo = (e) => {
     default:
       return e;
   }
-}, Ko = (e) => {
+}, Bo = (e) => {
   switch (e) {
     case "Regular":
       return "esriGraphNamedObjectRegular";
@@ -2175,7 +2175,7 @@ const Uo = (e) => {
       return e;
   }
 };
-function Bo(e) {
+function Ho(e) {
   switch (e) {
     case "esriGraphPropertyRegular":
       return "Regular";
@@ -2213,7 +2213,10 @@ function Bo(e) {
       return "Regular";
   }
 }
-function Ho(e, t) {
+function Y(e) {
+  return e?.configurable?.abortSignal;
+}
+function Jo(e, t) {
   return t ? `${e}
 
 Your previous attempt to generate a cypher query failed. See the details below and generate a new cypher query that avoids this error.
@@ -2223,68 +2226,72 @@ Execution Error: ${t.executionError}
 Failed Query:
 ${t.failedGraphQuery}` : e;
 }
-async function Jo(e, t, r, o) {
-  const { graphQuery: a, explanation: n } = await ie(e, t, r, o);
+async function Zo(e, t, r, o) {
+  const { graphQuery: a, explanation: n } = await pe(e, t, r, o);
   return `Generated Graph Query: 
 ${a}
 
 Explanation: ${n}`;
 }
-async function ie(e, t, r, o, a) {
+async function pe(e, t, r, o, a) {
   const n = {
-    message: Ho(e, a),
-    context: new Wo(t)
+    message: Jo(e, a),
+    context: new Vo(t)
   };
-  Q.conversationId && (n.conversationId = Q.conversationId), await S({ text: "Attempting to generate a cypher query from your prompt..." }, o);
-  const s = await le(`${r}/chat`, {
+  _.conversationId && (n.conversationId = _.conversationId);
+  const c = Y(o);
+  await v({ text: "Attempting to generate a cypher query from your prompt..." }, o);
+  const s = await he(`${r}/chat`, {
     method: "post",
     body: JSON.stringify(n),
     headers: {
       "Content-Type": "application/json",
-      token: ce.findCredential(k.getDefault().url)?.token ?? ""
-    }
+      token: me.findCredential(F.getDefault().url)?.token ?? ""
+    },
+    signal: c
   });
   if (s.httpStatus !== 200)
     throw new Error(`Graph query service returned an error: ${s.httpStatus}`, {
       cause: s.data
     });
-  Q.conversationId || (Q.conversationId = s.data.conversationId);
-  let c = !1;
+  _.conversationId || (_.conversationId = s.data.conversationId);
+  let l = !1;
   const u = Date.now();
-  let l = s.data.sequenceNumber, d = "", p = "", h = 1;
-  for (; !c; ) {
-    await new Promise((w) => setTimeout(w, 1e3)), await S(
-      { text: `Periodically requesting status of job from ArcGIS AI Services${"...".substring(0, h)}` },
+  let d = s.data.sequenceNumber, p = "", m = "", f = 1;
+  for (; !l; ) {
+    await new Promise((h) => setTimeout(h, 1e3)), await v(
+      { text: `Periodically requesting status of job from ArcGIS AI Services${"...".substring(0, f)}` },
       o
-    ), h = h % 3 + 1;
-    const m = await le(`${r}/chat`, {
+    ), f = f % 3 + 1;
+    const g = await he(`${r}/chat`, {
       method: "post",
       body: JSON.stringify({
         conversationId: s.data.conversationId,
         inquiryId: s.data.inquiryId,
-        ackSequenceNumber: l
+        ackSequenceNumber: d
       }),
       headers: {
         "Content-Type": "application/json",
-        token: ce.findCredential(k.getDefault().url)?.token ?? ""
-      }
+        token: me.findCredential(F.getDefault().url)?.token ?? ""
+      },
+      signal: c
     });
-    if (m.httpStatus !== 200)
-      throw new Error(`Graph query service polling returned an error: ${m.httpStatus}`, {
-        cause: m.data
+    if (g.httpStatus !== 200)
+      throw new Error(`Graph query service polling returned an error: ${g.httpStatus}`, {
+        cause: g.data
       });
-    if (m.data.context)
-      d = m.data.context.graphQuery, p = m.data.message || "";
-    else if (!m.data.hasMore)
-      c = !0;
+    if (g.data.context)
+      p = g.data.context.graphQuery, m = g.data.message || "";
+    else if (!g.data.hasMore)
+      l = !0;
     else if (Date.now() - u > 6e4)
       throw new Error("Graph query service polling timed out after 1 minute.");
-    l = m.data.sequenceNumber;
+    d = g.data.sequenceNumber;
   }
-  return { graphQuery: d, explanation: p };
+  return { graphQuery: p, explanation: m };
 }
-const F = 3;
-function Re(e, t = 100) {
+const q = 3;
+function Fe(e, t = 100) {
   const r = {};
   for (const o of Object.entries(e.properties ?? {})) {
     const [a, n] = o;
@@ -2292,131 +2299,131 @@ function Re(e, t = 100) {
   }
   return e.properties = r, e;
 }
-function se(e) {
+function D(e) {
   return typeof e != "object" || e === null ? String(e) : "details" in e && typeof e.details == "object" && e.details !== null && "errorMessage" in e.details && typeof e.details.errorMessage == "string" ? e.details.errorMessage : "message" in e && typeof e.message == "string" ? e.message : String(e);
 }
-const Zo = async ({
+const Yo = async ({
   kg: e,
   queryParams: t,
   targetStructure: r,
   targetStructureReducer: o,
   requestOptions: a,
   queryRowLimit: n,
-  queryTimeoutMs: s
+  queryTimeoutMs: c
 }) => {
-  let c = null, u = r;
-  const l = new AbortController(), d = a?.signal, p = () => {
-    l.abort(d?.reason);
+  let s = null, l = r;
+  const u = new AbortController(), d = a?.signal, p = () => {
+    u.abort(d?.reason);
   };
-  d && (d.aborted ? l.abort(d.reason) : d.addEventListener("abort", p, { once: !0 }));
+  d && (d.aborted ? u.abort(d.reason) : d.addEventListener("abort", p, { once: !0 }));
   try {
-    const h = await pt(e, t, a);
-    c = h.resultHeader;
-    const m = h.resultRowsStream.getReader();
-    let w = 0;
-    const y = Date.now(), g = !1;
+    const m = await mt(e, t, a);
+    s = m.resultHeader;
+    const f = m.resultRowsStream.getReader();
+    let g = 0;
+    const h = Date.now(), w = !1;
     for (; ; ) {
-      const { done: T, value: E } = await m.read();
+      const { done: T, value: C } = await f.read();
       if (T)
         break;
-      if (!g && s && Date.now() - y > s)
-        return l.abort(), { type: "timeout" };
-      for (const v of E) {
-        if (w++, n && w > n)
-          return l.abort(), { type: "success", rowLimitReached: !0, resultHeader: c, processedResult: u };
-        u = o(u, v);
+      if (!w && c && Date.now() - h > c)
+        return u.abort(), { type: "timeout" };
+      for (const S of C) {
+        if (g++, n && g > n)
+          return u.abort(), { type: "success", rowLimitReached: !0, resultHeader: s, processedResult: l };
+        l = o(l, S);
       }
     }
-  } catch (h) {
-    return l.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: se(h), error: h };
+  } catch (m) {
+    return u.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: D(m), error: m };
   } finally {
     d?.removeEventListener("abort", p);
   }
-  return { type: "success", rowLimitReached: !1, resultHeader: c, processedResult: u };
+  return { type: "success", rowLimitReached: !1, resultHeader: s, processedResult: l };
 };
-async function $e({
+async function Ie({
   prompt: e,
   kg: t,
   graphQueryServiceUrl: r,
   targetStructure: o,
   targetStructureReducer: a,
   requestOptions: n,
-  queryRowLimit: s,
-  queryTimeoutMs: c,
-  config: u
+  queryRowLimit: c,
+  queryTimeoutMs: s,
+  config: l
 }) {
-  let l;
-  for (let d = 1; d <= F; d++) {
+  let u;
+  for (let d = 1; d <= q; d++) {
     let p;
     try {
-      p = await ie(e, t.dataModel, r, u, l);
-    } catch (w) {
+      p = await pe(e, t.dataModel, r, l, u);
+    } catch (g) {
       return {
         type: "generation-error",
-        errorMessage: se(w),
-        error: w
+        errorMessage: D(g),
+        error: g
       };
     }
-    await S(
+    await v(
       {
         text: `Attempting to execute query: ${p.graphQuery.substring(0, 500)}${p.graphQuery.length > 500 ? "..." : ""}`
       },
-      u
+      l
     );
-    const h = await Zo({
+    const m = await Yo({
       kg: t,
-      queryParams: new ge({
+      queryParams: new ve({
         openCypherQuery: p.graphQuery
       }),
       targetStructure: o,
       targetStructureReducer: a,
       requestOptions: n,
-      queryRowLimit: s,
-      queryTimeoutMs: c
-    }), m = h.type === "aborted" ? "Query execution was aborted." : h.type === "timeout" ? "Query execution timed out." : h.type === "error" ? `Query failed with error: ${h.errorMessage}` : "";
-    if (h.type === "success")
+      queryRowLimit: c,
+      queryTimeoutMs: s
+    }), f = m.type === "aborted" ? "Query execution was aborted." : m.type === "timeout" ? "Query execution timed out." : m.type === "error" ? `Query failed with error: ${m.errorMessage}` : "";
+    if (m.type === "success")
       return {
         type: "success",
         graphQuery: p.graphQuery,
         explanation: p.explanation,
-        rowLimitReached: h.rowLimitReached,
-        resultHeader: h.resultHeader,
-        processedResult: h.processedResult
+        rowLimitReached: m.rowLimitReached,
+        resultHeader: m.resultHeader,
+        processedResult: m.processedResult
       };
-    if (h.type === "aborted")
+    if (m.type === "aborted")
       return {
         type: "aborted",
-        errorMessage: m,
+        errorMessage: f,
         graphQuery: p.graphQuery,
         explanation: p.explanation
       };
-    if (d >= F)
-      return h.type === "timeout" ? {
+    if (d >= q)
+      return m.type === "timeout" ? {
         type: "timeout",
-        errorMessage: m,
+        errorMessage: f,
         graphQuery: p.graphQuery,
         explanation: p.explanation
       } : {
         type: "execution-error",
-        errorMessage: m,
-        error: h.error,
+        errorMessage: f,
+        error: m.error,
         graphQuery: p.graphQuery,
         explanation: p.explanation
       };
-    l = {
+    u = {
       failedGraphQuery: p.graphQuery,
-      executionError: m,
+      executionError: f,
       attemptCount: d
-    }, await S(
-      { text: `Attempt ${d} failed with error: ${m}. Retrying...` },
-      u
+    }, await v(
+      { text: `Attempt ${d} failed with error: ${f}. Retrying...` },
+      l
     );
   }
   throw new Error(
-    `Failed to execute generated cypher due to an unexpected error after ${F} attempts.`
+    `Failed to execute generated cypher due to an unexpected error after ${q} attempts.`
   );
 }
-const Yo = async ({
+const Xo = async ({
   kg: e,
   searchQuery: t,
   typeCategoryFilter: r,
@@ -2424,80 +2431,83 @@ const Yo = async ({
   searchResultLimit: a,
   requestOptions: n
 }) => {
-  const s = [];
-  let c = [r];
-  r === "both" && !e.serviceDefinition.serviceCapabilities.searchCapabilities.searchTypeFilterCapabilities.includes("esriTypeBoth") && (c = ["entity", "relationship"]);
-  const u = a ?? 1 / 0;
+  const c = [];
+  let s = [r];
+  r === "both" && !e.serviceDefinition.serviceCapabilities.searchCapabilities.searchTypeFilterCapabilities.includes("esriTypeBoth") && (s = ["entity", "relationship"]);
+  const l = a ?? 1 / 0;
   try {
-    for (const l of c) {
-      const d = u - s.length;
+    for (const u of s) {
+      const d = l - c.length;
       if (d <= 0)
         break;
-      const m = (await ht(
+      const f = (await ht(
         e,
-        new mt({
+        new yt({
           searchQuery: t,
-          typeCategoryFilter: l,
+          typeCategoryFilter: u,
           namedTypesFilter: o ?? void 0,
           num: d
         }),
         n
       )).resultRowsStream.getReader();
-      let w = !1;
-      for (; !w; ) {
-        const { done: y, value: g } = await m.read();
-        if (y) {
-          w = !0;
+      let g = !1;
+      for (; !g; ) {
+        const { done: h, value: w } = await f.read();
+        if (h) {
+          g = !0;
           break;
         }
-        for (const T of g)
-          for (const E of T)
-            s.push(E);
+        for (const T of w)
+          for (const C of T)
+            c.push(C);
       }
     }
-  } catch (l) {
-    return console.log('Error when running graph search with query: "', t, '" - error: ', l), n?.signal?.aborted ? {
-      type: "aborted"
-    } : { type: "error", errorMessage: se(l), error: l };
+  } catch (u) {
+    const d = D(u);
+    return n?.signal?.aborted ? {
+      type: "aborted",
+      errorMessage: d,
+      error: u
+    } : { type: "error", errorMessage: d, error: u };
   }
   return {
     type: "success",
-    results: s
+    results: c
   };
 };
-function Xo(e, t) {
-  D(e, (r) => {
+function ea(e, t) {
+  A(e, (r) => {
     t.set(`${r.typeName}__${r.id}`, {
       id: r.id,
       typeName: r.typeName
     });
   });
 }
-function D(e, t) {
+function A(e, t) {
   if (!(!e || typeof e != "object")) {
-    if (ta(e))
+    if (ra(e))
       for (const r of e.path)
-        D(r, t);
-    else if (ea(e))
+        A(r, t);
+    else if (ta(e))
       t(e);
     else if (Array.isArray(e))
       for (const r of e)
-        D(r, t);
-    else if (ra(e))
+        A(r, t);
+    else if (oa(e))
       for (const r of Object.values(e.properties ?? {}))
-        D(r, t);
+        A(r, t);
   }
 }
-function ea(e) {
+function ta(e) {
   return !e || typeof e != "object" || Array.isArray(e) ? !1 : "id" in e && "typeName" in e;
 }
-function ta(e) {
+function ra(e) {
   return !e || typeof e != "object" || Array.isArray(e) ? !1 : e && "path" in e && Array.isArray(e.path);
 }
-function ra(e) {
+function oa(e) {
   return !e || typeof e != "object" || Array.isArray(e) || "id" in e ? !1 : "properties" in e && typeof e.properties == "object";
 }
-function oa(e, t) {
+function aa(e, t) {
   const r = [];
   for (const o of [...t.dataModel.entityTypes, ...t.dataModel.relationshipTypes]) {
     const a = e.getMemberIdsByType(o.name);
@@ -2506,95 +2516,107 @@ function oa(e, t) {
   }
   return r;
 }
-function aa(e) {
+function na(e) {
   const t = [], r = [], a = e?.allLayers.find((n) => n.type === "knowledge-graph")?.inclusionModeDefinition;
   if (a?.generateAllSublayers)
     return { allNamedTypesFullyDynamic: !0, idTypePairs: t, dynamicTypes: r };
-  for (const [n, s] of a?.namedTypeDefinitions ?? [])
-    if (s.useAllData)
+  for (const [n, c] of a?.namedTypeDefinitions ?? [])
+    if (c.useAllData)
       r.push(n);
     else
-      for (const [c] of s.members)
-        t.push({ id: c, typeName: n });
+      for (const [s] of c.members)
+        t.push({ id: s, typeName: n });
   return { allNamedTypesFullyDynamic: !1, idTypePairs: t, dynamicTypes: r };
 }
-async function na(e, t, r, o, a) {
-  const { view: n } = o, s = await $e({
+async function ia(e, t, r, o, a) {
+  const { view: n } = o, c = await Ie({
     prompt: e,
     kg: t,
     graphQueryServiceUrl: r,
     targetStructure: /* @__PURE__ */ new Map(),
-    targetStructureReducer: (p, h) => {
-      for (const m of h)
-        Xo(m, p);
+    targetStructureReducer: (p, m) => {
+      for (const f of m)
+        ea(f, p);
       return p;
     },
     requestOptions: {
-      signal: a?.signal,
+      signal: Y(a),
       timeout: a?.timeout
     },
     config: a
   });
-  if (s.type !== "success") {
-    const p = s.type === "generation-error" ? s.errorMessage : `${s.errorMessage} Cypher query: ${s.graphQuery}`;
+  if (c.type !== "success") {
+    const p = c.type === "generation-error" ? c.errorMessage : `${c.errorMessage} Cypher query: ${c.graphQuery}`;
     throw new Error(`Failed to add records to the link chart. ${p}`);
   }
-  const { graphQuery: c, explanation: u, processedResult: l } = s, d = Array.from(l.values());
-  return await S(
+  const { graphQuery: s, explanation: l, processedResult: u } = c, d = Array.from(u.values());
+  return await v(
     {
       text: `Query Results parsed into ${d.length} unique relationships and entities.  Atempting to add to link chart...`
     },
     a
-  ), !z(n) && n?.map ? (await n.map.addRecords(d), await B(n), `Link Chart updated successfully.  Cypher Query used: 
-${c}
+  ), !k(n) && n?.map ? (await n.map.addRecords(d), await J(n), `Link Chart updated successfully.  Cypher Query used: 
+${s}
 
-Explanation: ${u}`) : (await n?.map?.allLayers.find(
-    (h) => h.type === "knowledge-graph"
+Explanation: ${l}`) : (await n?.map?.allLayers.find(
+    (m) => m.type === "knowledge-graph"
   )?.addRecords(d), `Map updated successfully.  Cypher Query used: 
-${c}
+${s}
 
-Explanation: ${u}`);
+Explanation: ${l}`);
 }
-const Ee = "addRecords", ia = i.object({
+const W = "addRecords", sa = i.object({
   prompt: i.string().describe("The user's inquiry into the knowledge graph that needs to be run.")
-}), sa = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await G(t), o = H(t), { view: a } = o, s = k.getDefault().helperServices;
-  let c = e;
-  if (z(a)) {
-    const l = a.map, { allNamedTypesFullyDynamic: d, idTypePairs: p, dynamicTypes: h } = aa(l), m = await Y("arcgis_knowledge_current_map_context");
-    if (c = `${e}
+}), ca = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await O(t), o = Z(t), { view: a } = o, c = F.getDefault().helperServices;
+  let s = e;
+  if (k(a)) {
+    const l = a.map, { allNamedTypesFullyDynamic: u, idTypePairs: d, dynamicTypes: p } = na(l), m = await te("arcgis_knowledge_current_map_context");
+    if (s = `${e}
 
-${m}${JSON.stringify(p)} and all entities or relationships with the the following typeNames in the array: ${JSON.stringify(h)}`, d)
-      throw new Error(
-        "No records have been added to the map because all data in the knowledge graph is contained in the map."
-      );
+${m}${JSON.stringify(d)} and all entities or relationships with the the following typeNames in the array: ${JSON.stringify(p)}`, u)
+      return {
+        toolName: W,
+        status: "success",
+        summary: "No records have been added to the map because all data in the knowledge graph is contained in the map."
+      };
   } else {
-    const l = a.map, d = await Y("arcgis_knowledge_current_lc_context"), p = oa(l, r);
-    c = `${e}
+    const l = a.map, u = await te("arcgis_knowledge_current_lc_context"), d = aa(l, r);
+    s = `${e}
 
-${d}${JSON.stringify(p)}`;
+${u}${JSON.stringify(d)}`;
   }
-  const u = await na(
-    c,
-    r,
-    `${s.aiAssistantServices.url}${s.aiAssistantServices.graphQueryAssistant}`,
-    o,
-    t
-  );
-  return {
-    toolName: Ee,
-    status: "success",
-    summary: u
-  };
-}, Zn = f(sa, {
-  name: Ee,
+  try {
+    const l = await ia(
+      s,
+      r,
+      `${c.aiAssistantServices.url}${c.aiAssistantServices.graphQueryAssistant}`,
+      o,
+      t
+    );
+    return {
+      toolName: W,
+      status: "success",
+      summary: l
+    };
+  } catch (l) {
+    const u = D(l);
+    return {
+      toolName: W,
+      status: "error",
+      errorMessage: `Failed to add records to the link chart. ${u}`,
+      error: l
+    };
+  }
+}, Yn = y(ca, {
+  name: W,
   description: "Adds records (entities or relationships) to the current link chart visualization from an inquiry into the knowledge graph data. The inquiry will retrieve data from the graph database that will serve as the basis for the records to be added to the link chart.  The user should have explicitly requested to add records to the current link chart from their prompt.",
-  schema: ia
+  schema: sa
 });
-async function ca(e, t) {
-  return await t.map?.applyLayout(e), await B(t), `Successfully applied layout: ${e}.`;
+async function la(e, t) {
+  return await t.map?.applyLayout(e), await J(t), `Successfully applied layout: ${e}.`;
 }
-const ee = "applyLayout", la = i.object({
+const oe = "applyLayout", ua = i.object({
   layout: i.enum([
     "organic-standard",
     "organic-community",
@@ -2608,59 +2630,59 @@ const ee = "applyLayout", la = i.object({
   ]).describe(
     "The layout mode to apply to the link chart.  The value must be one of the following: organic-standard, organic-community, basic-grid, hierarchical-bottom-to-top, radial-root-centric, tree-left-to-right, geographic-organic-standard, chronological-mono-timeline, chronological-multi-timeline"
   )
-}), ua = async ({ layout: e }, t) => {
-  const { view: r } = H(t);
-  if (z(r))
+}), da = async ({ layout: e }, t) => {
+  const { view: r } = Z(t);
+  if (k(r))
     return {
-      toolName: ee,
+      toolName: oe,
       status: "error",
       errorMessage: "The applyLayout tool can only be used with a LinkChartView.",
       error: new Error()
     };
   {
-    const o = await ca(e, r);
+    const o = await la(e, r);
     return {
-      toolName: ee,
+      toolName: oe,
       status: "success",
       summary: o
     };
   }
-}, Yn = f(ua, {
-  name: ee,
+}, Xn = y(da, {
+  name: oe,
   description: "Apply a diagram layout to the link chart",
-  schema: la
+  schema: ua
 });
-async function da(e, t) {
-  return t.map?.changeNonspatialDataDisplay(e), await B(t), `Successfully applied nonspatial visibility setting: ${e}.`;
+async function pa(e, t) {
+  return t.map?.changeNonspatialDataDisplay(e), await J(t), `Successfully applied nonspatial visibility setting: ${e}.`;
 }
-const te = "changeNonspatialVisibility", pa = i.object({
+const ae = "changeNonspatialVisibility", ma = i.object({
   setting: i.enum(["hidden", "visible"]).describe("The setting of nonspatial visibility")
 }), ha = async ({ setting: e }, t) => {
-  const { view: r } = H(t);
-  if (z(r))
+  const { view: r } = Z(t);
+  if (k(r))
     return {
-      toolName: te,
+      toolName: ae,
       status: "error",
       errorMessage: "The changeNonspatialVisibility tool can only be used with a LinkChartView.",
       error: new Error()
     };
   {
-    const o = await da(e, r);
+    const o = await pa(e, r);
     return {
-      toolName: te,
+      toolName: ae,
       status: "success",
       summary: o
     };
   }
-}, Xn = f(ha, {
-  name: te,
+}, ei = y(ha, {
+  name: ae,
   description: "Change whether or not nonspatial data is visible in the link chart.  The value must be either 'hidden' or 'visible'.",
-  schema: pa
+  schema: ma
 });
-async function ma(e, t, r, o, a) {
-  let n;
-  for (let s = 1; s <= F; s++) {
-    const { graphQuery: c, explanation: u } = await ie(
+async function ya(e, t, r, o, a) {
+  let n, c = "";
+  for (let s = 1; s <= q; s++) {
+    const { graphQuery: l, explanation: u } = await pe(
       e,
       t.dataModel,
       r,
@@ -2668,83 +2690,86 @@ async function ma(e, t, r, o, a) {
       n
     );
     try {
-      await S({ text: `Attempting to create link chart from derived query: ${c}` }, a);
-      const l = await dt.fromCypherQuery(
+      await v({ text: `Attempting to create link chart from derived query: ${l}` }, a);
+      const d = await pt.fromCypherQuery(
         t,
-        new ge({
-          openCypherQuery: c
+        new ve({
+          openCypherQuery: l
         })
       );
-      await S({ text: "Link chart created successfully, loading..." }, a), await l.load();
-      const d = o.map;
-      return o.map = l, await o.when(), await qe.whenOnce(() => !o.updating), l.entityCount === 0 && l.relationshipCount === 0 ? (o.map === l && (o.map = d), l.destroy(), {
+      await v({ text: "Link chart created successfully, loading..." }, a), await d.load();
+      const p = o.map;
+      return o.map = d, await o.when(), await Ae.whenOnce(() => !o.updating), d.entityCount === 0 && d.relationshipCount === 0 ? (o.map === d && (o.map = p), d.destroy(), {
         type: "error",
         message: `Query returned no results. Cypher Query used to create the link chart: 
-${c}
+${l}
 
 Explanation: ${u}`
-      }) : (await B(o), {
+      }) : (await J(o), {
         type: "success",
         message: `Link chart created successfully.  Cypher Query used to create the link chart: 
-${c}
+${l}
 
 Explanation: ${u}`
       });
-    } catch (l) {
-      const d = l instanceof Error ? l.message : String(l);
-      if (s >= F)
-        throw new Error(
-          `Failed to create link chart after ${F} attempts. Last error: ${d}`
-        );
+    } catch (d) {
+      const p = D(d);
+      if (s >= q) {
+        c = p;
+        break;
+      }
       n = {
-        failedGraphQuery: c,
-        executionError: d,
+        failedGraphQuery: l,
+        executionError: p,
         attemptCount: s
-      }, await S(
-        { text: `Attempt ${s} to create link chart failed with error: ${d}. Retrying ...` },
+      }, await v(
+        { text: `Attempt ${s} to create link chart failed with error: ${p}. Retrying ...` },
         a
       );
     }
   }
-  throw new Error(`Failed to create link chart after ${F} attempts.`);
+  return {
+    type: "error",
+    message: `Failed to create link chart after ${q} attempts. Last error: ${c}`
+  };
 }
-const _ = "createLinkChart", ya = i.object({
+const V = "createLinkChart", fa = i.object({
   prompt: i.string().describe(
     "The user's inquiry into the knowledge graph that needs to be transformed into a link chart visualization."
   )
-}), fa = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await G(t), { view: o } = H(t);
-  if (z(o))
+}), ga = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await O(t), { view: o } = Z(t);
+  if (k(o))
     return {
-      toolName: _,
+      toolName: V,
       status: "error",
       errorMessage: "The createLinkChart tool can only be used with a LinkChartView.",
       error: new Error()
     };
   {
-    const n = k.getDefault().helperServices, s = await ma(
+    const n = F.getDefault().helperServices, c = await ya(
       e,
       r,
       `${n.aiAssistantServices.url}${n.aiAssistantServices.graphQueryAssistant}`,
       o,
       t
     );
-    return s.type === "error" ? {
-      toolName: _,
+    return c.type === "error" ? {
+      toolName: V,
       status: "error",
-      errorMessage: s.message,
+      errorMessage: c.message,
       error: new Error()
     } : {
-      toolName: _,
+      toolName: V,
       status: "success",
-      summary: s.message
+      summary: c.message
     };
   }
-}, ei = f(fa, {
-  name: _,
+}, ti = y(ga, {
+  name: V,
   description: "Creates a new link chart visualization from an inquiry into the knowledge graph data. The inquiry will retrieve data from the graph database that will serve as the basis for the new link chart.  The user should have explicitly requested the creation of a new link chart from their prompt.",
-  schema: ya
-}), Ce = "queryGraphData", ga = i.object({
+  schema: fa
+}), ne = "queryGraphData", wa = i.object({
   prompt: i.string().describe(
     `The user's inquiry into the knowledge graph, from which a cypher query will be generated and executed to answer the inquiry. IMPORTANT: 
 
@@ -2752,44 +2777,49 @@ REQUEST LIMIT: If the user does not specifically request for no limits or an exp
 
 DESCRIPTIVE COLUMN NAMES: If the user's prompt does not explicitly request for specific column names in the result, ensure that the generated query has descriptive column names (using AS statements) to make the results easier to understand when displayed in a table format.`
   )
-}), wa = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await G(t), a = k.getDefault().helperServices, n = await $e({
+}), ba = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await O(t), a = F.getDefault().helperServices, n = await Ie({
     prompt: e,
     kg: r,
     graphQueryServiceUrl: `${a.aiAssistantServices.url}${a.aiAssistantServices.graphQueryAssistant}`,
     targetStructure: new Array(),
-    targetStructureReducer: (h, m) => (h.push(m), h),
+    targetStructureReducer: (m, f) => (m.push(f), m),
     requestOptions: {
-      signal: t?.signal,
+      signal: Y(t),
       timeout: t?.timeout
     },
     config: t
   });
   if (n.type !== "success") {
-    const h = n.type === "generation-error" ? n.errorMessage : `${n.errorMessage} Cypher query: ${n.graphQuery}`;
-    throw new Error(`Failed to query the knowledge graph. ${h}`);
+    const m = n.type === "generation-error" ? n.errorMessage : `${n.errorMessage} Cypher query: ${n.graphQuery}`;
+    return {
+      toolName: ne,
+      status: "error",
+      errorMessage: `Failed to query the knowledge graph. ${m}`,
+      error: "error" in n ? n.error : null
+    };
   }
-  const { graphQuery: s, processedResult: c, resultHeader: u } = n, l = u.headerKeys;
-  for (const h of c)
-    for (const m of h)
-      D(
-        m,
-        (w) => Re(w)
+  const { graphQuery: c, processedResult: s, resultHeader: l } = n, u = l.headerKeys;
+  for (const m of s)
+    for (const f of m)
+      A(
+        f,
+        (g) => Fe(g)
       );
-  const d = 50, p = c.slice(0, d).map((h) => JSON.stringify(h));
+  const d = 50, p = s.slice(0, d).map((m) => JSON.stringify(m));
   return {
-    toolName: Ce,
+    toolName: ne,
     status: "success",
     summary: `To answer the inquiry, the following cypher query was executed against the knowledge graph:
 
 \`\`\`cypher
-${s}
+${c}
 \`\`\`
 
 Query Results:
 ${p.length} result(s) found.
 
-Column Headers: ${l.join(", ")}
+Column Headers: ${u.join(", ")}
 
 ${p.length > d ? `Showing top ${d} results:
 
@@ -2799,106 +2829,120 @@ ${p.length > d ? `Showing top ${d} results:
 `)}
 `,
     details: {
-      generatedQuery: s,
-      resultHeader: u,
-      queryResults: c
+      generatedQuery: c,
+      resultHeader: l,
+      queryResults: s
     }
   };
-}, ti = f(wa, {
-  name: Ce,
+}, ri = y(ba, {
+  name: ne,
   description: "Allows users to explore the data in their knowledge graph via cypher query. Generates and executes a cypher query based on the user's inquiry into the knowledge graph, and displays the results in the chat pane without modifying the user's link chart if any. Use this tool when the user is asking an exploratory question about their data as a whole that can be answered via cypher query, for example 'What are the top 5 suppliers by total parts cost?' or 'How many employees do we have in each department?'.",
-  schema: ga
-}), Ie = "generateCypher", ba = i.object({
+  schema: wa
+}), ie = "generateCypher", Ta = i.object({
   prompt: i.string().describe("The user's inquiry into the knowledge graph that needs to be translated into a cypher query.")
-}), Ta = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await G(t), a = k.getDefault().helperServices, n = await Jo(
-    e,
-    r.dataModel,
-    `${a.aiAssistantServices.url}${a.aiAssistantServices.graphQueryAssistant}`,
-    t
-  );
-  return {
-    toolName: Ie,
-    status: "success",
-    summary: n
-  };
-}, ri = f(Ta, {
-  name: Ie,
+}), Sa = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await O(t), a = F.getDefault().helperServices;
+  try {
+    const n = await Zo(
+      e,
+      r.dataModel,
+      `${a.aiAssistantServices.url}${a.aiAssistantServices.graphQueryAssistant}`,
+      t
+    );
+    return {
+      toolName: ie,
+      status: "success",
+      summary: n
+    };
+  } catch (n) {
+    const c = D(n);
+    return {
+      toolName: ie,
+      status: "error",
+      errorMessage: `Failed to generate Cypher query. ${c}`,
+      error: n
+    };
+  }
+}, oi = y(Sa, {
+  name: ie,
   description: "Generates an Open Cypher query based on the user's prompt which represents an inquiry into the data of the knowledge service and its graph database, attempting to filter based on certain conditions and traverse specified relationships. The generated query should be syntactically correct and optimized for performance.",
-  schema: ba
+  schema: Ta
 }), va = (e) => {
   const t = e.dataModel, r = /* @__PURE__ */ new Map();
-  for (const c of t.searchIndexes)
-    if (c.supportedCategory !== "esriTypeMetaEntityProvenance")
-      for (const [u, l] of c.searchProperties.entries()) {
-        const d = r.get(u) ?? /* @__PURE__ */ new Set();
-        l.propertyNames.forEach((p) => d.add(p)), r.set(u, d);
+  for (const s of t.searchIndexes)
+    if (s.supportedCategory !== "esriTypeMetaEntityProvenance")
+      for (const [l, u] of s.searchProperties.entries()) {
+        const d = r.get(l) ?? /* @__PURE__ */ new Set();
+        u.propertyNames.forEach((p) => d.add(p)), r.set(l, d);
       }
-  const o = t.entityTypes.filter((c) => r.has(c.name)), a = t.relationshipTypes.filter((c) => r.has(c.name)), n = `Entity Types:
-${o.map(({ name: c }) => `${c}: [${Array.from(r.get(c) ?? []).join(", ")}]`).join(`
-`)}`, s = `Relationship Types:
-${a.map(({ name: c }) => `${c}: [${Array.from(r.get(c) ?? []).join(", ")}]`).join(`
+  const o = t.entityTypes.filter((s) => r.has(s.name)), a = t.relationshipTypes.filter((s) => r.has(s.name)), n = `Entity Types:
+${o.map(({ name: s }) => `${s}: [${Array.from(r.get(s) ?? []).join(", ")}]`).join(`
+`)}`, c = `Relationship Types:
+${a.map(({ name: s }) => `${s}: [${Array.from(r.get(s) ?? []).join(", ")}]`).join(`
 `)}`;
   return `${n}
 
-${s}`;
+${c}`;
 };
-async function Sa(e, t) {
-  const r = await Y("arcgis_knowledge_lucene_generation_prompt"), o = {
+async function xa(e, t) {
+  const r = await te("arcgis_knowledge_lucene_generation_prompt"), o = {
     inquiry: e,
     dataModelForSearch: va(t)
   }, a = i.enum(["entity", "relationship", "both"]).describe("The graph element category to search against - entity, relationship, or both"), n = i.number().int().positive().nullable().describe(
     "The maximum number of search results to return. Default to 10 if not specified by the user, or set to null if the user specifically requests no limits or all results."
-  ), s = i.array(
+  ), c = i.array(
     i.enum(
-      t.dataModel.entityTypes.map((l) => l.name).concat(t.dataModel.relationshipTypes.map((l) => l.name))
+      t.dataModel.entityTypes.map((u) => u.name).concat(t.dataModel.relationshipTypes.map((u) => u.name))
     )
-  ).min(1), c = i.object({
+  ).min(1), s = i.object({
     query: i.string().describe("A lucene syntax query string to be executed against the knowledge graph search API"),
-    typeFilters: s.nullable().describe(
+    typeFilters: c.nullable().describe(
       "Nullable list of entity or relationship types from the graph to limit the search to. If set to null, search will execute against all named types with indexed properties in the graph"
     ),
     typeCategoryFilter: a,
     resultLimit: n
   });
-  return await ze({
+  return await qe({
     promptText: r,
     inputVariables: o,
-    schema: c
+    schema: s
   });
 }
-const Fe = "searchGraphData", xa = i.object({
+const se = "searchGraphData", Ra = i.object({
   prompt: i.string().describe(
     "The user's inquiry into the knowledge graph, from which a lucene search query will be generated and executed against the graph to return relevant results."
   )
-}), Ra = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await G(t);
-  await S({ text: "Generating search query for the user inquiry" }, t);
-  const o = await Sa(e, r);
-  await S({ text: "Executing graph search with generated search query" }, t);
-  const a = await Yo({
+}), $a = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await O(t);
+  await v({ text: "Generating search query for the user inquiry" }, t);
+  const o = await xa(e, r);
+  await v({ text: "Executing graph search with generated search query" }, t);
+  const a = await Xo({
     kg: r,
     searchQuery: o.query,
     typeCategoryFilter: o.typeCategoryFilter,
     namedTypesFilter: o.typeFilters,
     searchResultLimit: o.resultLimit,
     requestOptions: {
-      signal: t?.signal,
+      signal: Y(t),
       timeout: t?.timeout
     }
   });
   if (a.type !== "success")
-    throw new Error(
-      `Graph search failed with error: ${a.type === "error" ? a.errorMessage : "aborted"}`
-    );
-  for (const c of a.results)
-    D(
-      c,
-      (u) => Re(u)
+    return {
+      toolName: se,
+      status: "error",
+      errorMessage: a.errorMessage,
+      error: "error" in a ? a.error : null
+    };
+  for (const s of a.results)
+    A(
+      s,
+      (l) => Fe(l)
     );
-  const n = 10, s = a.results.slice(0, n);
+  const n = 10, c = a.results.slice(0, n);
   return {
-    toolName: Fe,
+    toolName: se,
     status: "success",
     summary: `To answer the query, the following lucene query was generated and executed:
     Query: ${o.query}
@@ -2910,7 +2954,7 @@ const Fe = "searchGraphData", xa = i.object({
     
     ${a.results.length > n ? `Showing top ${n} results:
 
-` : ""}${s.map((c) => JSON.stringify(c)).join(`
+` : ""}${c.map((s) => JSON.stringify(s)).join(`
 `)}`,
     details: {
       generatedQuery: o,
@@ -2919,56 +2963,56 @@ const Fe = "searchGraphData", xa = i.object({
       }
     }
   };
-}, oi = f(Ra, {
-  name: Fe,
+}, ai = y($a, {
+  name: se,
   description: "Allows users to search the knowledge graph for text matching their inquiry, using lucene search syntax, against indexed string properties defined on their entities and relationships. Use this tool when the user asks a question about their knowledge graph data as a whole, that could be answered via lucene text search of properties stored on graph elements, e.g requiring fuzzy matching. Otherwise if the inquiry is looking for connected records (e.g. paths), data aggregations, etc explore the data via the queryGraphData tool.",
-  schema: xa
+  schema: Ra
 });
 export {
-  zn as A,
-  qn as B,
+  qn as A,
+  An as B,
   Dn as C,
-  An as D,
-  Ln as E,
-  Pn as F,
-  ne as G,
-  Kn as H,
-  jn as I,
-  Gn as J,
-  On as K,
-  Mn as L,
-  Qn as M,
-  Tn as N,
-  Wn as O,
-  Vn as P,
-  Oo as Q,
-  N as R,
-  _n as S,
-  Un as T,
-  Yn as a,
-  ri as b,
-  Xn as c,
-  ei as d,
-  Zn as e,
-  we as f,
-  Y as g,
-  Jn as h,
-  G as i,
-  Hn as j,
+  Ln as D,
+  Pn as E,
+  jn as F,
+  de as G,
+  Bn as H,
+  Gn as I,
+  On as J,
+  Mn as K,
+  Qn as L,
+  _n as M,
+  Sn as N,
+  Vn as O,
+  Un as P,
+  Mo as Q,
+  I as R,
+  Wn as S,
+  Kn as T,
+  Xn as a,
+  oi as b,
+  ei as c,
+  ti as d,
+  Yn as e,
+  xe as f,
+  te as g,
+  Zn as h,
+  O as i,
+  Jn as j,
   vn as k,
-  Bn as l,
-  Sn as m,
-  xn as n,
-  Rn as o,
-  $n as p,
-  ti as q,
+  Hn as l,
+  xn as m,
+  Rn as n,
+  $n as o,
+  Cn as p,
+  ri as q,
   kn as r,
-  oi as s,
-  _t as t,
+  ai as s,
+  Wt as t,
   En as u,
-  Cn as v,
-  In as w,
-  Fn as x,
+  Nn as v,
+  Fn as w,
+  In as x,
   $ as y,
-  Nn as z
+  zn as z
 };