@arcgis/ai-components 5.1.2 → 5.1.4

package/dist/chunks/adapter.js

@@ -1,7 +1,7 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
 import pe from "@arcgis/core/identity/IdentityManager.js";
 import k from "@arcgis/core/portal/Portal.js";
-import { Annotation as b, messagesStateReducer as be } from "@langchain/langgraph/web";
+import { Annotation as T, messagesStateReducer as be } from "@langchain/langgraph/web";
 import "@arcgis/toolkit/string";
 import { k as De, j as H, i as Pe } from "./generateLayerDescriptions.js";
 import "@langchain/core/messages";
@@ -10,23 +10,23 @@ import "@langchain/openai";
 import X from "@arcgis/core/config.js";
 import * as Ae from "@arcgis/core/core/reactiveUtils.js";
 import "@arcgis/core/layers/FeatureLayer.js";
-import he from "@arcgis/core/request.js";
+import me from "@arcgis/core/request.js";
 import "@langchain/core/prompts";
-import { tool as w } from "@langchain/core/tools";
-import je from "@arcgis/core/Graphic.js";
-import { addressToLocations as Le } from "@arcgis/core/rest/locator.js";
+import { tool as g } from "@langchain/core/tools";
+import Le from "@arcgis/core/Graphic.js";
+import { addressToLocations as je } from "@arcgis/core/rest/locator.js";
 import Ge from "@arcgis/core/symbols/PictureMarkerSymbol.js";
 import s, { z as E } from "zod";
 import Oe from "@arcgis/core/geometry/Extent.js";
 import Te from "@arcgis/core/geometry/Point.js";
 import { createRenderer as Me } from "@arcgis/core/smartMapping/renderers/pieChart.js";
 import { getSchemesByTag as Qe, getSchemes as _e } from "@arcgis/core/smartMapping/symbology/pieChart.js";
-import { getBackgroundColorTheme as me } from "@arcgis/core/views/support/colorUtils.js";
-import { a as x, s as S } from "./index.js";
+import { getBackgroundColorTheme as he } from "@arcgis/core/views/support/colorUtils.js";
+import { a as R, s as x } from "./index.js";
 import { createAgeRenderer as We, createContinuousRenderer as Ve } from "@arcgis/core/smartMapping/renderers/color.js";
 import { getSchemesByTag as se } from "@arcgis/core/smartMapping/symbology/color.js";
-import { createContinuousRenderer as Ue } from "@arcgis/core/smartMapping/renderers/univariateColorSize.js";
-import { createRenderer as Be } from "@arcgis/core/smartMapping/renderers/dotDensity.js";
+import { createContinuousRenderer as Be } from "@arcgis/core/smartMapping/renderers/univariateColorSize.js";
+import { createRenderer as Ue } from "@arcgis/core/smartMapping/renderers/dotDensity.js";
 import { getSchemesByTag as Ke } from "@arcgis/core/smartMapping/symbology/dotDensity.js";
 import { createRenderer as He } from "@arcgis/core/smartMapping/renderers/heatmap.js";
 import { getSchemesByTag as Je } from "@arcgis/core/smartMapping/symbology/heatmap.js";
@@ -45,37 +45,37 @@ import { formatDateOnly as lt, convertDateFormatToIntlOptions as _, formatTimeOn
 import ut from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
 import dt from "@arcgis/core/smartMapping/statistics/uniqueValues.js";
 import pt from "@arcgis/core/rest/support/TopFeaturesQuery.js";
-import ht from "@arcgis/core/rest/support/TopFilter.js";
-import mt from "@arcgis/core/WebLinkChart.js";
+import mt from "@arcgis/core/rest/support/TopFilter.js";
+import ht from "@arcgis/core/WebLinkChart.js";
 import Se from "@arcgis/core/rest/knowledgeGraph/GraphQueryStreaming.js";
 import "@arcgis/core/views/LinkChartView.js";
 import { fetchKnowledgeGraph as fe, executeQueryStreaming as yt, executeSearchStreaming as ft } from "@arcgis/core/rest/knowledgeGraphService.js";
 import gt from "@arcgis/core/rest/knowledgeGraph/GraphSearchStreaming.js";
-const j = (e, r) => r ?? e, $n = b.Root({
+const L = (e, t) => t ?? e, En = T.Root({
   ...De(),
   // internal to the navigation agent
-  intent: b({
-    reducer: j
+  intent: T({
+    reducer: L
   }),
-  vectorSearchLayerResults: b({
-    reducer: j,
+  vectorSearchLayerResults: T({
+    reducer: L,
     default: () => []
   }),
-  vectorSearchFieldResults: b({
-    reducer: j
+  vectorSearchFieldResults: T({
+    reducer: L
   }),
-  navigationInternalState: b({
-    reducer: j,
+  navigationInternalState: T({
+    reducer: L,
     default: () => ({
       toolCallMessage: void 0
     })
   })
 });
-async function wt(e, r) {
-  const a = k.getDefault().helperServices, o = a.geocode.find((h) => h.name === "ArcGIS World Geocoding Service") ?? a.geocode[0];
+async function wt(e, t) {
+  const a = k.getDefault().helperServices, o = a.geocode.find((m) => m.name === "ArcGIS World Geocoding Service") ?? a.geocode[0];
   if (!o)
     throw new Error("No geocoding service found in helperServices.");
-  const n = o.url, l = `${X.assetsPath?.endsWith("/") ? X.assetsPath : `${X.assetsPath}/`}esri/images/search/search-symbol-32.png`, c = (await Le(n, {
+  const n = o.url, l = `${X.assetsPath?.endsWith("/") ? X.assetsPath : `${X.assetsPath}/`}esri/images/search/search-symbol-32.png`, c = (await je(n, {
     address: { SingleLine: e },
     outFields: ["Match_addr"]
   }))?.[0];
@@ -85,11 +85,11 @@ async function wt(e, r) {
     url: l,
     width: 24,
     height: 24
-  }), d = new je({
+  }), d = new Le({
     geometry: c.location,
     symbol: u
   });
-  r.graphics.removeAll(), r.graphics.add(d), await r.goTo(c.extent);
+  t.graphics.removeAll(), t.graphics.add(d), await t.goTo(c.extent);
   const p = {
     address: c.address ?? "",
     location: c.location ? c.location.toJSON() : null,
@@ -102,27 +102,27 @@ async function wt(e, r) {
 }
 const bt = ["mapView"];
 function C(e) {
-  const t = e?.configurable?.context;
-  if (!t || typeof t != "object")
+  const r = e?.configurable?.context;
+  if (!r || typeof r != "object")
     throw new Error("NavigationAgent context missing");
-  const a = bt.filter((o) => !(o in t));
+  const a = bt.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`NavigationAgent context missing: ${a.join(", ")}`);
-  return t;
+  return r;
 }
-async function Tt({ address: e }, r) {
-  const { mapView: t } = C(r);
-  return await wt(e, t);
+async function Tt({ address: e }, t) {
+  const { mapView: r } = C(t);
+  return await wt(e, r);
 }
 const vt = s.object({
   address: s.string().describe("The full address or place name to locate.")
-}), Cn = w(Tt, {
+}), Fn = g(Tt, {
   name: "goToAddress",
   description: "Geocodes an address using Esri's World Geocoding Service and zooms the map to that location.",
   schema: vt
 });
-async function St(e, r) {
-  const a = r.map.bookmarks;
+async function St(e, t) {
+  const a = t.map.bookmarks;
   if (!a || a.length === 0)
     throw new Error("No bookmarks found in the map.");
   const o = a.find((l) => l.name === e);
@@ -131,31 +131,31 @@ async function St(e, r) {
   const n = o.viewpoint;
   if (!n)
     throw new Error(`Bookmark with name "${e}" does not have a valid viewpoint.`);
-  return await r.goTo(n), { text: `Navigated to bookmark: ${e}` };
+  return await t.goTo(n), { text: `Navigated to bookmark: ${e}` };
 }
-async function xt({ bookmarkName: e }, r) {
-  const { mapView: t } = C(r);
-  return await Promise.resolve(St(e, t));
+async function xt({ bookmarkName: e }, t) {
+  const { mapView: r } = C(t);
+  return await Promise.resolve(St(e, r));
 }
 const Rt = E.object({
   bookmarkName: E.string().describe("The name of the bookmark to navigate to.")
-}), En = w(xt, {
+}), kn = g(xt, {
   name: "goToBookmark",
   description: "Go to the extent of the bookmark with the given name.",
   schema: Rt
 });
-async function $t(e, r, t) {
-  const a = t.map?.allLayers.find((l) => l.id === e);
+async function $t(e, t, r) {
+  const a = r.map?.allLayers.find((l) => l.id === e);
   if (!a)
     return { text: `Error: Layer with id ${e} not found` };
-  const o = r?.trim() ? r : "1=1", n = a.createQuery();
+  const o = t?.trim() ? t : "1=1", n = a.createQuery();
   n.where = o;
   try {
     const { extent: l, count: i } = await a.queryExtent(n);
     if (i === 0)
       return { text: `No features found in ${a.title} matching: ${o}`, where: o };
     if (l)
-      await t.goTo(l);
+      await r.goTo(l);
     else
       return { text: `Error: Unable to determine extent for ${a.title}`, where: o };
     const c = {
@@ -173,88 +173,88 @@ async function $t(e, r, t) {
     return console.error("Error in goToFeatures:", l), { text: `Error: ${l instanceof Error ? l.message : "Unknown error"}`, where: o };
   }
 }
-async function Ct({ layerId: e, where: r }, t) {
-  const { mapView: a } = C(t);
-  return await $t(e, r, a);
+async function Ct({ layerId: e, where: t }, r) {
+  const { mapView: a } = C(r);
+  return await $t(e, t, a);
 }
 const Et = 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")
-}), Fn = w(Ct, {
+}), Nn = g(Ct, {
   name: "goToFeatures",
   description: "Go to the features that match the given filter related to the given layerId.",
   schema: Et
 });
 async function Ft(e) {
-  const t = new Oe({
+  const r = new Oe({
     xmin: -180,
     ymin: -90,
     xmax: 180,
     ymax: 90,
     spatialReference: { wkid: 4326 }
   }).expand(0.7);
-  return await e.goTo(t), { text: "Successfully zoomed to world extent" };
+  return await e.goTo(r), { text: "Successfully zoomed to world extent" };
 }
-async function kt(e, r) {
-  const { mapView: t } = C(r);
-  return await Ft(t);
+async function kt(e, t) {
+  const { mapView: r } = C(t);
+  return await Ft(r);
 }
-const Nt = E.object({}), kn = w(kt, {
+const Nt = E.object({}), qn = g(kt, {
   name: "goToFullExtent",
   description: "Zooms the map to the full world extent using Esri's Geocoding Service.",
   schema: Nt
 });
 async function qt(e) {
-  const t = e.map.initialViewProperties?.viewpoint?.targetGeometry;
-  if (t)
-    await e.goTo(t);
+  const r = e.map.initialViewProperties?.viewpoint?.targetGeometry;
+  if (r)
+    await e.goTo(r);
   else
     throw new Error("Initial extent is undefined");
   return { text: "Successfully zoomed to home extent" };
 }
-async function It(e, r) {
-  const { mapView: t } = C(r);
-  return await qt(t);
+async function It(e, t) {
+  const { mapView: r } = C(t);
+  return await qt(r);
 }
-const zt = s.object({}), Nn = w(It, {
+const zt = s.object({}), In = g(It, {
   name: "goToHomeExtent",
   description: "Go to the initial web map view extent",
   schema: zt
 });
-async function Dt(e, r) {
-  await r.when();
-  const t = r.map?.allLayers.find((o) => o.id === e);
-  if (!t)
+async function Dt(e, t) {
+  await t.when();
+  const r = t.map?.allLayers.find((o) => o.id === e);
+  if (!r)
     return console.warn(`[goToLayer] No matching FeatureLayer found for: ${e}`), { text: `Could not find layer for: ${e}` };
   let a;
-  return (t.type === "link-chart" || t.type === "knowledge-graph-sublayer") && r.map?.activeLinkChartLayer ? a = r.map.diagramNodesExtent : a = t.fullExtent, a ? (await r.goTo(a), t.visible = !0, { text: `Successfully zoomed to: ${t.title ?? ""}` }) : { text: "Layer has no defined extent. Cannot zoom to layer." };
+  return (r.type === "link-chart" || r.type === "knowledge-graph-sublayer") && t.map?.activeLinkChartLayer ? a = t.map.diagramNodesExtent : a = r.fullExtent, a ? (await t.goTo(a), r.visible = !0, { text: `Successfully zoomed to: ${r.title ?? ""}` }) : { text: "Layer has no defined extent. Cannot zoom to layer." };
 }
-async function Pt({ layerId: e }, r) {
-  const { mapView: t } = C(r);
-  return await Dt(e, t);
+async function Pt({ layerId: e }, t) {
+  const { mapView: r } = C(t);
+  return await Dt(e, r);
 }
 const At = E.object({
   layerId: E.string().describe("The id of the layer to navigate to")
-}), qn = w(Pt, {
+}), zn = g(Pt, {
   name: "goToLayer",
   description: "Zooms the map view to the full extent of the top matching layer.",
   schema: At
 });
-async function jt(e, r) {
-  return await r.goTo({ scale: e }), { text: `Successfully zoomed to: ${e}` };
+async function Lt(e, t) {
+  return await t.goTo({ scale: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function Lt({ scale: e }, r) {
-  const { mapView: t } = C(r);
-  return await jt(e, t);
+async function jt({ scale: e }, t) {
+  const { mapView: r } = C(t);
+  return await Lt(e, r);
 }
 const Gt = s.object({
   scale: s.number().describe("The map scale of the view to go to.")
-}), In = w(Lt, {
+}), Dn = g(jt, {
   name: "goToScale",
   description: "Go to the specified view scale.",
   schema: Gt
 });
-async function Ot(e, r, t) {
+async function Ot(e, t, r) {
   const o = {
     target: new Te({
       longitude: e.longitude,
@@ -262,19 +262,19 @@ async function Ot(e, r, t) {
       spatialReference: { wkid: 4326 }
     })
   };
-  return t?.zoom !== void 0 && (o.zoom = t.zoom), t?.scale !== void 0 && (o.scale = t.scale), await r.goTo(o), { text: `Successfully navigated to: ${[
+  return r?.zoom !== void 0 && (o.zoom = r.zoom), r?.scale !== void 0 && (o.scale = r.scale), await t.goTo(o), { text: `Successfully navigated to: ${[
     `(${e.latitude}°, ${e.longitude}°)`,
-    t?.zoom !== void 0 ? `zoom ${t.zoom}` : "",
-    t?.scale !== void 0 ? `scale 1:${t.scale}` : ""
+    r?.zoom !== void 0 ? `zoom ${r.zoom}` : "",
+    r?.scale !== void 0 ? `scale 1:${r.scale}` : ""
   ].filter(Boolean).join(", ")}` };
 }
 async function Mt({
   center: e,
-  zoom: r,
-  scale: t
+  zoom: t,
+  scale: r
 }, a) {
   const { mapView: o } = C(a);
-  return await Ot(e, o, { zoom: r, scale: t });
+  return await Ot(e, o, { zoom: t, scale: r });
 }
 const Qt = s.object({
   center: s.object({
@@ -283,21 +283,21 @@ const Qt = s.object({
   }),
   zoom: s.number().optional().describe("The zoom level. Higher values = more zoomed in."),
   scale: s.number().optional().describe("The map scale. Alternative to zoom. Smaller numbers = more zoomed in.")
-}), zn = w(Mt, {
+}), Pn = g(Mt, {
   name: "goToViewpoint",
   description: "Go to the specified viewpoint. This can contain a combination of scale, center, zoom, etc.",
   schema: Qt
 });
-async function _t(e, r) {
-  return await r.goTo({ zoom: e }), { text: `Successfully zoomed to: ${e}` };
+async function _t(e, t) {
+  return await t.goTo({ zoom: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function Wt({ zoom: e }, r) {
-  const { mapView: t } = C(r);
-  return await _t(e, t);
+async function Wt({ zoom: e }, t) {
+  const { mapView: r } = C(t);
+  return await _t(e, r);
 }
 const Vt = s.object({
   zoom: s.number().min(1).max(20).describe("The zoom level of the view to go to.")
-}), Dn = w(Wt, {
+}), An = g(Wt, {
   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: Vt
@@ -316,48 +316,48 @@ const Vt = s.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 U(e) {
-  const r = Object.entries(ge).find(([t]) => t.endsWith(`/${e}.md`));
-  if (!r)
+async function B(e) {
+  const t = Object.entries(ge).find(([r]) => r.endsWith(`/${e}.md`));
+  if (!t)
     throw new Error(`Prompt not found: ${e}
 Available prompts:
 ${Object.keys(ge).join(`
 `)}`);
-  return await r[1]();
+  return await t[1]();
 }
-const Ut = (e, r = 300) => {
-  const t = e.replace(/\s+/gu, " ").replace(/[*_`#>\-]/gu, "").trim();
-  return t.length > r ? `${t.slice(0, r)}...` : t;
-}, xe = (e, r) => {
-  const a = e?.configurable?.services?.[r];
+const Bt = (e, t = 300) => {
+  const r = e.replace(/\s+/gu, " ").replace(/[*_`#>\-]/gu, "").trim();
+  return r.length > t ? `${r.slice(0, t)}...` : r;
+}, xe = (e, t) => {
+  const a = e?.configurable?.services?.[t];
   if (a == null)
-    throw new Error(`${r} missing in config.configurable.services`);
+    throw new Error(`${t} missing in config.configurable.services`);
   return a;
-}, Pn = (e, r) => (t, a) => {
+}, Ln = (e, t) => (r, a) => {
   const o = a?.configurable?.services;
   for (const n of e)
     if (!o?.[n])
-      throw new Error(`${r} requires services.${n} to be available.`);
-  return t;
+      throw new Error(`${t} requires services.${n} to be available.`);
+  return r;
 };
-async function Bt(e) {
-  const { fields: r, layer: t, view: a, styleName: o, colorSchemeTags: n } = e;
+async function Ut(e) {
+  const { fields: t, layer: r, view: a, styleName: o, colorSchemeTags: n } = e;
   let l;
   return n ? l = Qe({
-    basemapTheme: await me(a),
-    geometryType: t.geometryType,
+    basemapTheme: await he(a),
+    geometryType: r.geometryType,
     includedTags: n,
-    numColors: Math.min(r.length, 8)
+    numColors: Math.min(t.length, 8)
   })[0] : l = _e({
-    basemapTheme: await me(a),
-    geometryType: t.geometryType,
-    numColors: Math.min(r.length, 8)
+    basemapTheme: await he(a),
+    geometryType: r.geometryType,
+    numColors: Math.min(t.length, 8)
   }).primaryScheme, {
-    layer: t,
+    layer: r,
     view: a,
-    attributes: r.map((i) => ({
+    attributes: t.map((i) => ({
       field: i,
-      label: t.fields.find((c) => c.name === i)?.alias ?? ""
+      label: r.fields.find((c) => c.name === i)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
@@ -370,15 +370,15 @@ async function Kt(e) {
 }
 async function Ht({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   includeSize: n
 }) {
-  const l = r, i = e?.allLayers.find((d) => d.id === t);
+  const l = t, i = e?.allLayers.find((d) => d.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const u = {
     styleName: n ? "chart-size" : "chart",
     fields: a,
@@ -387,35 +387,35 @@ async function Ht({
     colorSchemeTags: o
   };
   try {
-    const d = await Bt(u), p = await Kt(d);
+    const d = await Ut(u), p = await Kt(d);
     return i.renderer = p.renderer, i.visible = !0, `Chart renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (d) {
     return `Error applying chart renderer: ${d instanceof Error ? d.message : String(d)}`;
   }
 }
 const Jt = ["mapView"];
-function R(e) {
-  const t = e?.configurable?.context;
-  if (!t || typeof t != "object")
+function $(e) {
+  const r = e?.configurable?.context;
+  if (!r || typeof r != "object")
     throw new Error("LayerStylingAgent context missing");
-  const a = Jt.filter((o) => !(o in t));
+  const a = Jt.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`LayerStylingAgent context missing: ${a.join(", ")}`);
-  return t;
+  return r;
 }
 async function Zt({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   includeSize: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Ht({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Ht({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     includeSize: a
   });
 }
@@ -424,7 +424,7 @@ const Yt = s.object({
   fields: s.array(s.string()).describe("The fields to use for the chart renderer (multiple numeric fields)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   includeSize: s.boolean().optional().describe("Whether to vary the chart size (chart-size)")
-}), An = w(Zt, {
+}), jn = g(Zt, {
   name: "chart",
   description: `Label: Charts
     Description: Show the values of two or more categories as a proportion of the total using a pie chart.
@@ -440,14 +440,14 @@ const Yt = s.object({
   schema: Yt
 });
 function Xt(e) {
-  const { fields: r, layer: t, view: a, theme: o, colorSchemeTags: n } = e, l = r[0];
+  const { fields: t, layer: r, view: a, theme: o, colorSchemeTags: n } = e, l = t[0];
   let i;
   return n && (i = se({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: n,
     theme: o || "high-to-low"
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     startTime: l,
     endTime: /* @__PURE__ */ new Date(),
@@ -462,15 +462,15 @@ async function er(e) {
 }
 async function tr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color-age",
     fields: a,
@@ -488,17 +488,17 @@ async function tr({
 }
 async function rr({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await tr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await tr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
@@ -507,7 +507,7 @@ const ar = s.object({
   fields: s.array(s.string()).describe("The field(s) to use for the color-age renderer (temporal/date data)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), jn = w(rr, {
+}), Gn = g(rr, {
   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.
@@ -517,16 +517,16 @@ const ar = s.object({
   schema: ar
 });
 function or(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o } = e;
-  let { theme: n } = e, l = r[1];
-  const i = r[0];
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
+  let { theme: n } = e, l = t[1];
+  const i = t[0];
   let c;
   return o && (c = se({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: o,
     theme: n || "high-to-low"
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     field: i,
     normalizationField: l,
@@ -541,15 +541,15 @@ async function nr(e) {
 }
 async function ir({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color",
     fields: a,
@@ -567,17 +567,17 @@ async function ir({
 }
 async function sr({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await ir({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await ir({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
@@ -586,7 +586,7 @@ const lr = s.object({
   fields: s.array(s.string()).describe("The field(s) to use for the color renderer"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), Ln = w(sr, {
+}), On = g(sr, {
   name: "color",
   description: `Label: Counts and Amounts (color)
     Description: Vary color along a continuous color ramp to represent numeric or ranked data.
@@ -596,15 +596,15 @@ const lr = s.object({
   schema: lr
 });
 function cr(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o, theme: n } = e;
+  const { fields: t, layer: r, view: a, colorSchemeTags: o, theme: n } = e;
   let l, i;
-  const c = r[0];
+  const c = t[0];
   return o && (i = se({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: o,
     theme: n || "high-to-low"
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     field: c,
     normalizationField: l,
@@ -615,19 +615,19 @@ function cr(e) {
   };
 }
 async function ur(e) {
-  return await Ue(e);
+  return await Be(e);
 }
 async function dr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color-size-univariate",
     fields: a,
@@ -645,67 +645,67 @@ async function dr({
 }
 async function pr({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await dr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await dr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
-const hr = s.object({
+const mr = s.object({
   layerId: s.string().describe("The id of the layer to apply the color-size univariate renderer to"),
   fields: s.array(s.string()).describe("The fields to use for the color-size univariate renderer"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color and size ramps")
-}), Gn = w(pr, {
+}), Mn = g(pr, {
   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: hr
+  schema: mr
 });
-function mr(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o } = e;
+function hr(e) {
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
   return o && (n = Ke({
     includedTags: o,
-    numColors: Math.min(r.length, 8)
+    numColors: Math.min(t.length, 8)
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     legendOptions: {
       unit: "units"
     },
-    attributes: r.map((l) => ({
+    attributes: t.map((l) => ({
       field: l,
-      label: t.fields.find((i) => i.name === l)?.alias ?? ""
+      label: r.fields.find((i) => i.name === l)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     dotDensityScheme: n
   };
 }
 async function yr(e) {
-  return await Be(e);
+  return await Ue(e);
 }
 async function fr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o
 }) {
-  const n = r, l = e?.allLayers.find((c) => c.id === t);
+  const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const i = {
     styleName: "dot-density",
     fields: a,
@@ -714,7 +714,7 @@ async function fr({
     colorSchemeTags: o
   };
   try {
-    const c = mr(i), u = await yr(c);
+    const c = hr(i), u = await yr(c);
     return l.renderer = u.renderer, l.visible = !0, `Dot Density renderer applied to layer: ${l.title ?? l.id} using fields ${a.join(", ")}`;
   } catch (c) {
     return `Error applying dot density renderer: ${c instanceof Error ? c.message : String(c)}`;
@@ -722,23 +722,23 @@ async function fr({
 }
 async function gr({
   layerId: e,
-  fields: r,
-  colorSchemes: t
+  fields: t,
+  colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await fr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await fr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
-    fields: r,
-    colorSchemes: t
+    fields: t,
+    colorSchemes: r
   });
 }
 const wr = s.object({
   layerId: s.string().describe("The id of the layer to apply the dot density renderer to"),
   fields: s.array(s.string()).describe("The field(s) to use for the dot density renderer (population or count data)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use")
-}), On = w(gr, {
+}), Qn = g(gr, {
   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.
@@ -755,14 +755,14 @@ const wr = s.object({
   schema: wr
 });
 function br(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o } = e;
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
-  const l = r[0];
+  const l = t[0];
   return o && (n = Je({
     includedTags: o,
     basemap: a.map?.basemap || "topo"
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     field: l,
     heatmapScheme: n
@@ -773,14 +773,14 @@ async function Tr(e) {
 }
 async function vr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o
 }) {
-  const n = r, l = e?.allLayers.find((c) => c.id === t);
+  const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const i = {
     styleName: "heatmap",
     fields: a,
@@ -797,23 +797,23 @@ async function vr({
 }
 async function Sr({
   layerId: e,
-  fields: r,
-  colorSchemes: t
+  fields: t,
+  colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await vr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await vr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
-    fields: r,
-    colorSchemes: t
+    fields: t,
+    colorSchemes: r
   });
 }
 const xr = s.object({
   layerId: s.string().describe("The id of the layer to apply the heatmap renderer to"),
   fields: s.array(s.string()).describe("The field(s) to use for the heatmap renderer (typically point density)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use")
-}), Mn = w(Sr, {
+}), _n = g(Sr, {
   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.
@@ -823,16 +823,16 @@ Fields: This typically requires zero or one field of type number.`,
   schema: xr
 });
 function Rr(e) {
-  const { fields: r, layer: t, view: a, styleName: o, colorSchemeTags: n } = e;
+  const { fields: t, layer: r, view: a, styleName: o, colorSchemeTags: n } = e;
   let l;
   return n && (l = Ye({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: n,
-    numColors: Math.min(r.length, 10)
+    numColors: Math.min(t.length, 10)
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
-    fields: r.map((i) => ({ name: i })).slice(0, 9),
+    fields: t.map((i) => ({ name: i })).slice(0, 9),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     includeSizeVariable: o.includes("Size"),
@@ -844,15 +844,15 @@ async function $r(e) {
 }
 async function Cr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   includeSize: n
 }) {
-  const l = r, i = e?.allLayers.find((d) => d.id === t);
+  const l = t, i = e?.allLayers.find((d) => d.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const u = {
     styleName: n ? "predominance-size" : "predominance",
     fields: a,
@@ -869,17 +869,17 @@ async function Cr({
 }
 async function Er({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   includeSize: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Cr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Cr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     includeSize: a
   });
 }
@@ -888,7 +888,7 @@ const Fr = s.object({
   fields: s.array(s.string()).describe("The fields to use for the predominance renderer (competing categories)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   includeSize: s.boolean().optional().describe("Whether to include size visualization (predominance-size)")
-}), Qn = w(Er, {
+}), Wn = g(Er, {
   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.
@@ -904,18 +904,18 @@ const Fr = s.object({
   schema: Fr
 });
 function kr(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o } = e;
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
   const l = {
-    field: r[0]
+    field: t[0]
   }, i = {
-    field: r[1]
+    field: t[1]
   };
   return o && (n = et({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: o
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     field1: l,
     field2: i,
@@ -929,14 +929,14 @@ async function Nr(e) {
 }
 async function qr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o
 }) {
-  const n = r, l = e?.allLayers.find((c) => c.id === t);
+  const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const i = {
     styleName: "relationship",
     fields: a,
@@ -953,23 +953,23 @@ async function qr({
 }
 async function Ir({
   layerId: e,
-  fields: r,
-  colorSchemes: t
+  fields: t,
+  colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await qr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await qr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
-    fields: r,
-    colorSchemes: t
+    fields: t,
+    colorSchemes: r
   });
 }
 const zr = s.object({
   layerId: s.string().describe("The id of the layer to apply the relationship renderer to"),
   fields: s.array(s.string()).describe("The two fields to use for the relationship renderer (bivariate visualization)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use")
-}), _n = w(Ir, {
+}), Vn = g(Ir, {
   name: "relationship",
   description: `Label: Relationship
     Description: Overlays two color ramps to represent the relationship between two numeric attributes.
@@ -979,9 +979,9 @@ const zr = s.object({
   schema: zr
 });
 function Dr(e) {
-  const { fields: r, layer: t, view: a, theme: o } = e, n = r[0];
+  const { fields: t, layer: r, view: a, theme: o } = e, n = t[0];
   return {
-    layer: t,
+    layer: r,
     view: a,
     startTime: n,
     endTime: /* @__PURE__ */ new Date(),
@@ -995,15 +995,15 @@ async function Pr(e) {
 }
 async function Ar({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "size-age",
     fields: a,
@@ -1019,42 +1019,42 @@ async function Ar({
     return `Error applying size-age renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function jr({
+async function Lr({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Ar({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Ar({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
-const Lr = s.object({
+const jr = s.object({
   layerId: s.string().describe("The id of the layer to apply the size-age renderer to"),
   fields: s.array(s.string()).describe("The field(s) to use for the size-age renderer (temporal data with size)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), Wn = w(jr, {
+}), Bn = g(Lr, {
   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: Lr
+  schema: jr
 });
 function Gr(e) {
-  const { fields: r, layer: t, view: a } = e;
-  let { theme: o } = e, n = r[1];
-  const l = r[0];
+  const { fields: t, layer: r, view: a } = e;
+  let { theme: o } = e, n = t[1];
+  const l = t[0];
   return {
-    layer: t,
+    layer: r,
     view: a,
     field: l,
     normalizationField: n,
@@ -1068,15 +1068,15 @@ async function Or(e) {
 }
 async function Mr({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "size",
     fields: a,
@@ -1094,17 +1094,17 @@ async function Mr({
 }
 async function Qr({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Mr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Mr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
@@ -1113,7 +1113,7 @@ const _r = s.object({
   fields: s.array(s.string()).describe("The field(s) to use for the size renderer (numeric data)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), Vn = w(Qr, {
+}), Un = g(Qr, {
   name: "size",
   description: `Label: Counts and Amounts (size)
     Description: Vary symbol sizes along a continuous ramp to represent numeric or ranked data.
@@ -1129,13 +1129,13 @@ const _r = s.object({
   schema: _r
 });
 function Wr(e) {
-  const { fields: r, layer: t, view: a, colorSchemeTags: o } = e, n = r[0], l = r[1], i = r[2];
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e, n = t[0], l = t[1], i = t[2];
   let c;
   return o && (c = ot({
-    geometryType: t.geometryType,
+    geometryType: r.geometryType,
     includedTags: o
   })[0]), {
-    layer: t,
+    layer: r,
     view: a,
     field: n,
     field2: l,
@@ -1148,17 +1148,17 @@ function Wr(e) {
 async function Vr(e) {
   return await at(e);
 }
-async function Ur({
+async function Br({
   arcgisMap: e,
-  arcgisMapView: r,
-  layerId: t,
+  arcgisMapView: t,
+  layerId: r,
   fields: a,
   colorSchemes: o,
   theme: n
 }) {
-  const l = r, i = e?.allLayers.find((u) => u.id === t);
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
   if (!i)
-    return `Could not find layer for id: ${t}`;
+    return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "type",
     fields: a,
@@ -1174,19 +1174,19 @@ async function Ur({
     return `Error applying type renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Br({
+async function Ur({
   layerId: e,
-  fields: r,
-  colorSchemes: t,
+  fields: t,
+  colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Ur({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Br({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
-    fields: r,
-    colorSchemes: t,
+    fields: t,
+    colorSchemes: r,
     theme: a
   });
 }
@@ -1195,7 +1195,7 @@ const Kr = s.object({
   fields: s.array(s.string()).describe("The field(s) to use for the type renderer (categorical data)"),
   colorSchemes: s.array(s.string()).optional().describe("Optional color scheme tags to use"),
   theme: s.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color scheme")
-}), Un = w(Br, {
+}), Kn = g(Ur, {
   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.
@@ -1203,43 +1203,43 @@ Keywords: categorical, category, type, unique, discrete, point of interest, regi
 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: Kr
-}), Bn = b.Root({
+}), Hn = T.Root({
   ...H(),
-  vectorSearchLayerIds: b(),
-  vectorSearchFieldResults: b(),
-  layerFieldInfo: b(),
-  selectedLayerId: b()
-}), Kn = b.Root({
+  vectorSearchLayerIds: T(),
+  vectorSearchFieldResults: T(),
+  layerFieldInfo: T(),
+  selectedLayerId: T()
+}), Jn = T.Root({
   ...H(),
-  vectorSearchLayerIds: b(),
-  vectorSearchFieldResults: b(),
-  layerFieldInfo: b(),
-  queryResponse: b(),
-  dataExplorationMessages: b({
+  vectorSearchLayerIds: T(),
+  vectorSearchFieldResults: T(),
+  layerFieldInfo: T(),
+  queryResponse: T(),
+  dataExplorationMessages: T({
     reducer: be,
     default: () => []
   })
 }), Hr = ["mapView"];
 function N(e) {
-  const t = e?.configurable?.context;
-  if (!t || typeof t != "object")
+  const r = e?.configurable?.context;
+  if (!r || typeof r != "object")
     throw new Error("DataExplorationAgent context missing");
-  const a = Hr.filter((o) => !(o in t));
+  const a = Hr.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`DataExplorationAgent context missing: ${a.join(", ")}`);
-  return t;
+  return r;
 }
 const Jr = (e) => {
-  const r = e.map?.allLayers.filter((a) => a.type === "feature");
-  let t = 0;
-  return r?.forEach((a) => {
+  const t = e.map?.allLayers.filter((a) => a.type === "feature");
+  let r = 0;
+  return t?.forEach((a) => {
     const o = a;
-    o.featureEffect && (o.featureEffect = null, t++);
-  }), t > 0 ? `Cleared filters from ${t} layer(s). View unchanged.` : "No active filters to clear. View unchanged.";
-}, Zr = async (e, r) => {
-  const { mapView: t } = N(r);
-  return Jr(t);
-}, Yr = w(Zr, {
+    o.featureEffect && (o.featureEffect = null, r++);
+  }), r > 0 ? `Cleared filters from ${r} layer(s). View unchanged.` : "No active filters to clear. View unchanged.";
+}, Zr = async (e, t) => {
+  const { mapView: r } = N(t);
+  return Jr(r);
+}, Yr = g(Zr, {
   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: s.object({})
@@ -1250,41 +1250,41 @@ const Jr = (e) => {
   });
   const a = e.map.initialViewProperties?.viewpoint?.targetGeometry;
   return a ? (await e.goTo(a), "Cleared all filters and returned to home extent.") : "Cleared all filters. Could not determine home extent.";
-}, ea = async (e, r) => {
-  const { mapView: t } = N(r);
-  return await Xr(t);
-}, ta = w(ea, {
+}, ea = async (e, t) => {
+  const { mapView: r } = N(t);
+  return await Xr(r);
+}, ta = g(ea, {
   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: s.object({})
 }), we = 750;
-function B(e) {
+function U(e) {
   return "point" in e && e.point !== void 0;
 }
-function L(e) {
+function j(e) {
   return "layerId" in e && e.layerId !== void 0;
 }
-const J = async (e, r) => {
-  if (B(e)) {
-    const { point: t } = e;
+const J = async (e, t) => {
+  if (U(e)) {
+    const { point: r } = e;
     return { geometry: new Te({
-      x: t.x,
-      y: t.y,
-      spatialReference: t.spatialReference ? { wkid: t.spatialReference.wkid } : r.spatialReference
+      x: r.x,
+      y: r.y,
+      spatialReference: r.spatialReference ? { wkid: r.spatialReference.wkid } : t.spatialReference
     }) };
   }
-  if (L(e)) {
-    const t = r.map?.allLayers.find(
+  if (j(e)) {
+    const r = t.map?.allLayers.find(
       (n) => n.id === e.layerId
     );
-    if (!t)
+    if (!r)
       return { error: `Could not find geometry layer with ID: ${e.layerId}` };
-    const a = t.title ?? t.id, o = e.where?.trim() || "1=1";
+    const a = r.title ?? r.id, o = e.where?.trim() || "1=1";
     try {
-      const n = await t.queryFeatures({
+      const n = await r.queryFeatures({
         where: o,
         returnGeometry: !0,
-        outSpatialReference: r.spatialReference,
+        outSpatialReference: t.spatialReference,
         num: we + 1
       });
       if (!n.features.length)
@@ -1299,18 +1299,18 @@ const J = async (e, r) => {
       if (!l.length)
         return { error: "No valid geometries found for the matched geometry layer features." };
       const i = l.length === 1 ? l[0] : st.executeMany(l);
-      return i ? (i.spatialReference || (i.spatialReference = r.spatialReference), { geometry: i }) : { error: "Failed to combine geometries from geometry layer." };
+      return i ? (i.spatialReference || (i.spatialReference = t.spatialReference), { geometry: i }) : { error: "Failed to combine geometries from geometry layer." };
     } catch (n) {
       return { error: `Failed to query geometry: ${String(n)}` };
     }
   }
   return { error: "Invalid geometry configuration provided" };
-}, ra = async (e, r, t, a, o, n) => {
-  const l = e.map?.allLayers.find((c) => c.id === r);
+}, ra = async (e, t, r, a, o, n) => {
+  const l = e.map?.allLayers.find((c) => c.id === t);
   if (!l)
-    return { success: !1, error: `Layer '${r}' not found.` };
+    return { success: !1, error: `Layer '${t}' not found.` };
   const i = l.createQuery();
-  i.where = t ?? "1=1", a && (i.geometry = a, i.spatialRelationship = "intersects", o && (i.distance = o), n && (i.units = n));
+  i.where = r ?? "1=1", a && (i.geometry = a, i.spatialRelationship = "intersects", o && (i.distance = o), n && (i.units = n));
   try {
     const { extent: c, count: u } = await l.queryExtent(i);
     return !c || u === 0 ? {
@@ -1323,15 +1323,15 @@ const J = async (e, r) => {
       error: c instanceof Error ? c.message : String(c)
     };
   }
-}, aa = async (e, r, t, a, o, n) => {
-  const l = r.map?.allLayers.find(
+}, aa = async (e, t, r, a, o, n) => {
+  const l = t.map?.allLayers.find(
     (p) => p.id === e.layerId
   );
   if (!l)
     return `Could not find target layer with ID: ${e.layerId}`;
   let i;
   if (o) {
-    const p = await J(o, r);
+    const p = await J(o, t);
     if ("error" in p)
       return p.error;
     i = p.geometry;
@@ -1344,12 +1344,12 @@ const J = async (e, r) => {
       distance: o?.distance,
       units: o?.units
     }),
-    includedEffect: t,
+    includedEffect: r,
     excludedEffect: a
   }), l.visible = !0, n)
     return `Applied feature effects to "${l.title ?? e.layerId}" within current map extent.`;
   const c = e.objectIds?.length ? `${l.objectIdField} IN (${e.objectIds.join(",")})` : e.where, u = await ra(
-    r,
+    t,
     e.layerId,
     c,
     i,
@@ -1359,13 +1359,13 @@ const J = async (e, r) => {
   return u.success ? `Applied feature effects to target layer "${l.title ?? e.layerId}"${o && "layerId" in o ? ` using geometry from layer "${o.layerId}"` : ""}.` : `Applied filter to "${d}" but no features matched. ${u.error}`;
 }, oa = ["feet", "kilometers", "meters", "miles", "nautical-miles", "us-nautical-miles"], F = s.enum(oa), na = async ({
   targetLayer: e,
-  geometryFilter: r,
-  useCurrentExtent: t,
+  geometryFilter: t,
+  useCurrentExtent: r,
   includedEffect: a = "drop-shadow(2px, 2px, 2px, gray)",
   excludedEffect: o = "grayscale(100%) opacity(60%) blur(2px)"
 }, n) => {
   const { mapView: l } = N(n);
-  return await aa(e, l, a, o, r, t);
+  return await aa(e, l, a, o, t, r);
 }, ia = s.object({
   layerId: s.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: s.string().describe("The SQL-92 where clause representing the features from which to filter."),
@@ -1399,7 +1399,7 @@ const J = async (e, r) => {
   excludedEffect: s.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."
   )
-}), ca = w(na, {
+}), ca = g(na, {
   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: la
@@ -1407,20 +1407,20 @@ const J = async (e, r) => {
   if (e instanceof Date)
     return Number.isNaN(e.getTime()) ? null : e;
   if (typeof e == "number" && Number.isFinite(e)) {
-    const r = new Date(e);
-    return Number.isNaN(r.getTime()) ? null : r;
+    const t = new Date(e);
+    return Number.isNaN(t.getTime()) ? null : t;
   }
   return null;
 }, ua = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, da = (e) => {
   if (typeof e == "string" && e)
     return e;
-  const r = te(e);
-  return r ? r.toISOString().slice(0, 10) : null;
-}, Hn = () => {
-  const e = (/* @__PURE__ */ new Date()).getTimezoneOffset(), r = e <= 0 ? "+" : "-", t = Math.floor(Math.abs(e) / 60).toString().padStart(2, "0"), a = (Math.abs(e) % 60).toString().padStart(2, "0"), o = `${r}${t}:${a}`;
+  const t = te(e);
+  return t ? t.toISOString().slice(0, 10) : null;
+}, Zn = () => {
+  const e = (/* @__PURE__ */ new Date()).getTimezoneOffset(), t = e <= 0 ? "+" : "-", r = Math.floor(Math.abs(e) / 60).toString().padStart(2, "0"), a = (Math.abs(e) % 60).toString().padStart(2, "0"), o = `${t}${r}:${a}`;
   return { userTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone, userTimezoneOffset: o };
-}, pa = (e, r, t) => {
-  const a = r?.toLowerCase();
+}, pa = (e, t, r) => {
+  const a = t?.toLowerCase();
   if (a === "date-only") {
     const n = da(e);
     return n ? lt(n, _("short-date")) : e;
@@ -1437,62 +1437,62 @@ const J = async (e, r) => {
   const o = te(e);
   return o ? ye(o, {
     ..._("short-date-short-time"),
-    timeZone: ua(t)
+    timeZone: ua(r)
   }) : e;
-}, Re = (e, r, t) => {
+}, Re = (e, t, r) => {
   if (e && typeof e != "function") {
-    const a = "getField" in t && t.getField?.(e), o = a && "getFieldDomain" in t && t.getFieldDomain ? t.getFieldDomain(a.name) : null;
+    const a = "getField" in r && r.getField?.(e), o = a && "getFieldDomain" in r && r.getFieldDomain ? r.getFieldDomain(a.name) : null;
     if (o?.type === "coded-value") {
-      const l = o.codedValues.find((i) => i.code === r);
+      const l = o.codedValues.find((i) => i.code === t);
       return l ? l.name : null;
     }
   }
   return null;
-}, ha = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, ma = (e) => {
+}, ma = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, ha = (e) => {
   if (e instanceof Date)
     return Number.isNaN(e.getTime()) ? null : e;
   if (typeof e == "number" && Number.isFinite(e)) {
-    const r = new Date(e);
-    return Number.isNaN(r.getTime()) ? null : r;
+    const t = new Date(e);
+    return Number.isNaN(t.getTime()) ? null : t;
   }
   if (typeof e == "string" && e) {
-    const r = new Date(e);
-    return Number.isNaN(r.getTime()) ? null : r;
+    const t = new Date(e);
+    return Number.isNaN(t.getTime()) ? null : t;
   }
   return null;
-}, ya = (e, r) => {
+}, ya = (e, t) => {
   if (typeof e != "number")
     return e;
-  const t = {};
-  r.minimumFractionDigits !== void 0 && (t.minimumFractionDigits = r.minimumFractionDigits), r.maximumFractionDigits !== void 0 && (t.maximumFractionDigits = r.maximumFractionDigits), r.useGrouping === "always" ? t.useGrouping = !0 : r.useGrouping === "never" && (t.useGrouping = !1);
+  const r = {};
+  t.minimumFractionDigits !== void 0 && (r.minimumFractionDigits = t.minimumFractionDigits), t.maximumFractionDigits !== void 0 && (r.maximumFractionDigits = t.maximumFractionDigits), t.useGrouping === "always" ? r.useGrouping = !0 : t.useGrouping === "never" && (r.useGrouping = !1);
   try {
-    return new Intl.NumberFormat(void 0, t).format(e);
+    return new Intl.NumberFormat(void 0, r).format(e);
   } catch {
     return e;
   }
-}, fa = (e, r, t) => {
-  const a = ma(e);
+}, fa = (e, t, r) => {
+  const a = ha(e);
   if (!a)
     return e;
   const o = {};
-  r.dateStyle ? o.dateStyle = r.dateStyle : (r.year && (o.year = r.year), r.month && (o.month = r.month)), r.timeStyle && (o.timeStyle = r.timeStyle), r.timeStyle && r.hour12 === "always" ? o.hour12 = !0 : r.timeStyle && r.hour12 === "never" && (o.hour12 = !1), o.timeZone = ha(t);
+  t.dateStyle ? o.dateStyle = t.dateStyle : (t.year && (o.year = t.year), t.month && (o.month = t.month)), t.timeStyle && (o.timeStyle = t.timeStyle), t.timeStyle && t.hour12 === "always" ? o.hour12 = !0 : t.timeStyle && t.hour12 === "never" && (o.hour12 = !1), o.timeZone = ma(r);
   try {
     return new Intl.DateTimeFormat(void 0, o).format(a);
   } catch {
     return e;
   }
-}, $e = (e, r) => e.getFieldAlias?.(r) ?? e.fieldsIndex?.get(r)?.alias ?? e.fieldsIndex?.get(r)?.name ?? r, Ce = (e, r, t, a, o) => {
-  if (t == null)
-    return t;
-  const l = e.getFieldConfiguration?.(r)?.fieldFormat;
-  return l?.type === "number" ? ya(t, l) : l?.type === "date-time" ? fa(t, l, o) : pa(t, a, o);
-}, ga = (e, r, t, a) => {
-  const o = e.fieldsIndex?.get(r), n = Re(r, t, e) ?? t;
-  return Ce(e, r, n, o?.type, a);
-}, wa = (e, r) => $e(e, r), Ee = (e, r, t) => {
-  const a = e.objectIdField, o = r.features.map(
+}, $e = (e, t) => e.getFieldAlias?.(t) ?? e.fieldsIndex?.get(t)?.alias ?? e.fieldsIndex?.get(t)?.name ?? t, Ce = (e, t, r, a, o) => {
+  if (r == null)
+    return r;
+  const l = e.getFieldConfiguration?.(t)?.fieldFormat;
+  return l?.type === "number" ? ya(r, l) : l?.type === "date-time" ? fa(r, l, o) : pa(r, a, o);
+}, ga = (e, t, r, a) => {
+  const o = e.fieldsIndex?.get(t), n = Re(t, r, e) ?? r;
+  return Ce(e, t, n, o?.type, a);
+}, wa = (e, t) => $e(e, t), Ee = (e, t, r) => {
+  const a = e.objectIdField, o = t.features.map(
     (l) => l.attributes[a]
-  ), n = r.features.map((l) => {
+  ), n = t.features.map((l) => {
     const i = l.attributes, c = {};
     return e.fields.forEach((u) => {
       if (!Object.hasOwn(i, u.name))
@@ -1502,30 +1502,30 @@ const J = async (e, r) => {
         c[u.name] = d;
         return;
       }
-      const p = Re(u.name, d, e) ?? d, h = $e(e, u.name);
-      c[h] = Ce(e, u.name, p, u.type, t);
+      const p = Re(u.name, d, e) ?? d, m = $e(e, u.name);
+      c[m] = Ce(e, u.name, p, u.type, r);
     }), c;
   });
   return { objectIds: o, attributes: n };
-}, ba = (e, r, t) => {
+}, ba = (e, t, r) => {
   const a = e.createQuery();
-  return a.outFields = [r], a.where = t || "1=1", a.num = 1, a;
-}, Ta = async (e, r, t, a) => {
-  const o = a.map?.allLayers.find((h) => h.id === e), n = ba(o, r, t.where), i = (await o.queryFeatures(n)).features[0], c = i ? i.attributes[r] : null, u = ga(o, r, c, a.timeZone), d = wa(o, r);
+  return a.outFields = [t], a.where = r || "1=1", a.num = 1, a;
+}, Ta = async (e, t, r, a) => {
+  const o = a.map?.allLayers.find((m) => m.id === e), n = ba(o, t, r.where), i = (await o.queryFeatures(n)).features[0], c = i ? i.attributes[t] : null, u = ga(o, t, c, a.timeZone), d = wa(o, t);
   return {
     tool: "getAttribute",
     layerName: o.title ?? e,
     summary: `${d} = ${u}`,
     details: {
-      fieldName: r,
-      fieldAlias: d !== r ? d : void 0,
+      fieldName: t,
+      fieldAlias: d !== t ? d : void 0,
       value: u,
-      where: t.where
+      where: r.where
     }
   };
 };
-async function va({ layerId: e, fieldName: r, query: t }, a) {
-  const { mapView: o } = N(a), n = await Ta(e, r, t, o);
+async function va({ layerId: e, fieldName: t, query: r }, a) {
+  const { mapView: o } = N(a), n = await Ta(e, t, r, o);
   return JSON.stringify(n, null, 2);
 }
 const Sa = s.object({
@@ -1534,32 +1534,37 @@ const Sa = s.object({
   query: s.object({
     where: s.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
   })
-}), xa = w(va, {
+}), xa = g(va, {
   name: "getAttribute",
   description: "Returns an attribute value for a given feature.",
   schema: Sa
-}), le = (e, r, t) => t ? e.hasAllFeaturesInView && e.availableFields === r : e.hasAllFeatures && e.availableFields === r;
-function K(e, r) {
-  let t = e ?? "";
-  return r != null && r && (t = t ? `(${t}) AND (${r})` : r), t || null;
+}), le = (e, t, r) => {
+  if (!(r ? e.hasAllFeaturesInView : e.hasAllFeatures))
+    return !1;
+  const o = new Set((e.availableFields ?? []).map((n) => n.toLowerCase()));
+  return o.has("*") ? !0 : t.every((n) => o.has(n.toLowerCase()));
+};
+function K(e, t) {
+  let r = e ?? "";
+  return t != null && t && (r = r ? `(${r}) AND (${t})` : t), r || null;
 }
 const Ra = async (e) => {
-  const { targetLayer: r, fieldName: t, statisticType: a, mapView: o, layersAndFieldsRegistry: n, geometryFilter: l } = e, i = o.map?.allLayers.find((v) => v.id === r.layerId);
+  const { targetLayer: t, fieldName: r, statisticType: a, mapView: o, layersAndFieldsRegistry: n, geometryFilter: l } = e, i = o.map?.allLayers.find((v) => v.id === t.layerId);
   if (!i)
-    throw new Error(`Layer '${r.layerId}' not found.`);
-  const c = await o.whenLayerView(i), d = n.get(r.layerId)?.fieldRegistry.get(t), p = d?.alias;
+    throw new Error(`Layer '${t.layerId}' not found.`);
+  const c = await o.whenLayerView(i), d = n.get(t.layerId)?.fieldRegistry.get(r), p = d?.alias;
   if (!d)
-    throw new Error(`Field '${t}' not found.`);
-  let h, f;
+    throw new Error(`Field '${r}' not found.`);
+  let m, y;
   if (l) {
     const v = await J(l, o);
     if ("error" in v)
       throw new Error(v.error);
     if (!v.geometry)
-      throw L(l) ? new Error(`No features found matching: ${l.where}`) : new Error("Failed to create geometry");
-    if (L(l)) {
+      throw j(l) ? new Error(`No features found matching: ${l.where}`) : new Error("Failed to create geometry");
+    if (j(l)) {
       const Q = o.map?.allLayers.find((A) => A.id === l.layerId);
-      h = {
+      m = {
         geometryLayerName: Q?.title ?? Q?.id,
         geometryLayerId: l.layerId,
         geometryWhere: l.where,
@@ -1567,43 +1572,43 @@ const Ra = async (e) => {
         units: l.units,
         applied: !0
       };
-    } else B(l) && (h = {
+    } else U(l) && (m = {
       point: l.point,
       distance: l.distance,
       units: l.units,
       applied: !0
     });
-    f = new ve({
+    y = new ve({
       geometry: v.geometry,
       distance: l.distance,
       units: l.units,
       spatialRelationship: "intersects"
     });
   }
-  const y = le(c, [t], !1);
-  let m = null, g = null;
-  const T = 10;
+  const f = le(c, [r], !1);
+  let h = null, w = null;
+  const b = 10;
   if (d.type !== "geometry" && d.type !== "oid" && d.type !== "global-id")
     try {
       const v = {
         layer: i,
-        useFeaturesInView: y,
-        view: y ? o : void 0,
-        field: t,
-        sqlWhere: K(i.definitionExpression, r.where),
-        ...f && { filter: f },
+        useFeaturesInView: f,
+        view: f ? o : void 0,
+        field: r,
+        sqlWhere: K(i.definitionExpression, t.where),
+        ...y && { filter: y },
         outStatisticTypes: { include: [a] }
       };
-      m = await ut(v);
+      h = await ut(v);
       const Q = ["string", "small-integer", "integer"], A = d.domain?.type === "coded-value" ? d.domain : null;
-      (Q.includes(d.type) || A) && (g = (await dt({
+      (Q.includes(d.type) || A) && (w = (await dt({
         layer: i,
-        useFeaturesInView: y,
-        view: y ? o : void 0,
-        field: t,
-        sqlWhere: K(i.definitionExpression, r.where),
-        ...f && { filter: f }
-      })).uniqueValueInfos.sort((I, ze) => ze.count - I.count).slice(0, T)), g && d.domain?.type === "coded-value" && (g = g.map((I) => ({
+        useFeaturesInView: f,
+        view: f ? o : void 0,
+        field: r,
+        sqlWhere: K(i.definitionExpression, t.where),
+        ...y && { filter: y }
+      })).uniqueValueInfos.sort((I, ze) => ze.count - I.count).slice(0, b)), w && d.domain?.type === "coded-value" && (w = w.map((I) => ({
         ...I,
         value: A ? A.getName(I.value) ?? I.value : I.value
       })));
@@ -1612,30 +1617,30 @@ const Ra = async (e) => {
     }
   return {
     tool: "getStatistics",
-    layerName: i.title ?? r.layerId,
-    summary: `${a} = ${typeof m?.[a] == "number" ? m[a] : "N/A"}`,
+    layerName: i.title ?? t.layerId,
+    summary: `${a} = ${typeof h?.[a] == "number" ? h[a] : "N/A"}`,
     details: {
-      fieldName: t,
+      fieldName: r,
       fieldAlias: p,
       statisticType: a,
-      statistic: m?.[a] ?? null,
-      summaryStatistics: m,
-      uniqueValues: g,
-      where: r.where,
-      spatialFilterInfo: h
+      statistic: h?.[a] ?? null,
+      summaryStatistics: h,
+      uniqueValues: w,
+      where: t.where,
+      spatialFilterInfo: m
     }
   };
 };
 async function $a({
   targetLayer: e,
-  fieldName: r,
-  statisticType: t,
+  fieldName: t,
+  statisticType: r,
   geometryFilter: a
 }, o) {
   const n = xe(o, "layersAndFieldsRegistry"), { mapView: l } = N(o), i = await Ra({
     targetLayer: e,
-    fieldName: r,
-    statisticType: t,
+    fieldName: t,
+    statisticType: r,
     mapView: l,
     layersAndFieldsRegistry: n,
     geometryFilter: a
@@ -1667,7 +1672,7 @@ const Ca = s.object({
   ),
   fieldName: s.string().describe("The name of the field for which to get statistics. STRICTLY DO NOT use OBJECTID. Use any other field"),
   statisticType: s.enum(["avg", "max", "median", "min", "stddev", "sum", "variance", "nullcount", "count"]).describe("The statistic type to calculate.")
-}), ka = w($a, {
+}), ka = g($a, {
   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,19 +1688,19 @@ 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: Fa
-}), Na = async (e, r, t, a, o) => {
-  const n = t.map?.allLayers.find((h) => h.id === e.layerId), l = await t.whenLayerView(n), i = n.title ?? e.layerId;
+}), Na = (e) => e.flatMap((t) => t.split(",")).map((t) => t.trim()).map((t) => t.split(/\s+/u)[0]?.replace(/^"|"$/gu, "")).filter((t) => !!t), qa = async (e, t, r, a, o) => {
+  const n = r.map?.allLayers.find((m) => m.id === e.layerId), l = await r.whenLayerView(n), i = n.title ?? e.layerId;
   let c;
   if (a) {
-    const h = await J(a, t);
-    if ("error" in h)
+    const m = await J(a, r);
+    if ("error" in m)
       return {
         tool: "getTopFeatures",
         layerName: i,
         summary: "Geometry lookup failed",
-        details: { error: h.error }
+        details: { error: m.error }
       };
-    if (!h.geometry)
+    if (!m.geometry)
       return {
         tool: "getTopFeatures",
         layerName: i,
@@ -1704,13 +1709,13 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
           error: `No features found matching: ${"where" in a ? a.where : "unknown criteria"}`
         }
       };
-    c = h.geometry;
-  } else o && (c = t.extent.clone());
-  const u = r.groupByFields && r.groupByFields.length > 0, d = n.objectIdField, p = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, d])];
+    c = m.geometry;
+  } else o && (c = 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;
+    let m;
     if (u) {
-      const m = new pt({
+      const h = new pt({
         where: e.where || "1=1",
         outFields: p,
         orderByFields: e.orderByFields,
@@ -1718,60 +1723,62 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
         spatialRelationship: c ? "intersects" : void 0,
         distance: a?.distance,
         units: a?.units,
-        topFilter: new ht({
-          topCount: r.topCount,
-          groupByFields: r.groupByFields,
-          orderByFields: r.orderByFields
+        topFilter: new mt({
+          topCount: t.topCount,
+          groupByFields: t.groupByFields,
+          orderByFields: t.orderByFields
         })
       });
-      h = await n.queryTopFeatures(m);
+      m = await n.queryTopFeatures(h);
     } else {
-      const m = n.createQuery();
-      m.where = K(n.definitionExpression, e.where || "1=1"), m.outFields = p.length ? p : ["*"], m.orderByFields = r.orderByFields, m.num = r.topCount, c && (m.geometry = c, m.spatialRelationship = "intersects"), a?.distance && (m.distance = a.distance), a?.units && (m.units = a.units), m.outSpatialReference = t.spatialReference;
-      const g = le(l, e.outFields, o ?? !1);
+      const h = n.createQuery();
+      h.where = K(n.definitionExpression, e.where || "1=1"), h.outFields = p.length ? p : ["*"], h.orderByFields = t.orderByFields, h.returnGeometry = !1, h.num = t.topCount, c && (h.geometry = c, h.spatialRelationship = "intersects"), a?.distance && (h.distance = a.distance), a?.units && (h.units = a.units), h.outSpatialReference = r.spatialReference;
+      const w = [
+        .../* @__PURE__ */ new Set([...e.outFields, ...Na(t.orderByFields)])
+      ], b = le(l, w, o ?? !1);
       try {
-        h = g ? await l.queryFeatures(m) : await n.queryFeatures(m);
-      } catch (T) {
-        console.warn("Client-side query failed, falling back to server:", T), h = await n.queryFeatures(m);
+        m = b ? await l.queryFeatures(h) : await n.queryFeatures(h);
+      } catch (S) {
+        console.warn("Client-side query failed, falling back to server:", S), m = await n.queryFeatures(h);
       }
     }
-    const f = h.features.map((m) => m.attributes[d]), { attributes: y } = Ee(n, h, t.timeZone);
+    const y = m.features.map((h) => h.attributes[d]), { attributes: f } = Ee(n, m, r.timeZone);
     return {
       tool: "getTopFeatures",
       layerName: i,
-      summary: `Top ${r.topCount} features extracted`,
+      summary: `Top ${t.topCount} features extracted`,
       details: {
-        topCount: r.topCount,
-        attributes: y,
-        objectIds: f,
+        topCount: t.topCount,
+        attributes: f,
+        objectIds: y,
         objectIdField: d,
         where: e.where,
-        orderByFields: r.orderByFields,
-        ...u && { groupByFields: r.groupByFields }
+        orderByFields: t.orderByFields,
+        ...u && { groupByFields: t.groupByFields }
       }
     };
-  } catch (h) {
+  } catch (m) {
     return {
       tool: "getTopFeatures",
       layerName: i,
       summary: "Query failed",
-      details: { error: h instanceof Error ? h.message : String(h) }
+      details: { error: m instanceof Error ? m.message : String(m) }
     };
   }
-}, qa = async ({
+}, Ia = async ({
   targetLayer: e,
-  topFilter: r,
-  geometryFilter: t,
+  topFilter: t,
+  geometryFilter: r,
   useCurrentExtent: a
 }, o) => {
-  const { mapView: n } = N(o), l = await Na(e, r, n, t, a);
+  const { mapView: n } = N(o), l = await qa(e, t, n, r, a);
   return JSON.stringify(l, null, 2);
-}, Ia = s.object({
+}, za = s.object({
   layerId: s.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: s.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: s.number().optional().describe("The buffer distance around the geometry."),
   units: F.optional().describe("The units for the distance buffer.")
-}), za = s.object({
+}), Da = s.object({
   point: s.object({
     x: s.number().describe("X coordinate (longitude) from navigation result"),
     y: s.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1781,7 +1788,7 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: s.number().optional().describe("Optional buffer distance around the point."),
   units: F.optional().describe("The units for the distance buffer.")
-}), Da = s.object({
+}), Pa = s.object({
   targetLayer: s.object({
     layerId: s.string().describe("The layerId of the layer containing the field from which to get a value."),
     where: s.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value."),
@@ -1792,7 +1799,7 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
       ).default("*")
     )
   }),
-  geometryFilter: s.union([Ia, za]).optional().describe(
+  geometryFilter: s.union([za, Da]).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: s.object({
@@ -1805,83 +1812,85 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
   useCurrentExtent: s.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)."
   )
-}), Pa = w(qa, {
+}), Aa = g(Ia, {
   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: Da
-}), ee = 25, Aa = async (e, r, t, a) => {
-  const o = r.map?.allLayers.find((m) => m.id === e.layerId), n = await r.whenLayerView(o), l = o.title ?? e.layerId;
+  schema: Pa
+}), ee = 25, La = (e) => e.flatMap((t) => t.split(",")).map((t) => t.trim()).map((t) => t.split(/\s+/u)[0]?.replace(/^"|"$/gu, "")).filter((t) => !!t), ja = async (e, t, r, a) => {
+  const o = t.map?.allLayers.find((w) => w.id === e.layerId), n = await t.whenLayerView(o), l = o.title ?? e.layerId;
   let i;
-  if (t) {
-    const m = await J(t, r);
-    if ("error" in m) {
-      const g = { error: m.error };
-      if (L(t)) {
-        const T = r.map?.allLayers.find(($) => $.id === t.layerId);
-        g.geometryLayerName = T?.title ?? T?.id, g.geometryLayerId = t.layerId, g.geometryWhere = t.where;
-      } else B(t) && (g.point = t.point);
+  if (r) {
+    const w = await J(r, t);
+    if ("error" in w) {
+      const b = { error: w.error };
+      if (j(r)) {
+        const S = t.map?.allLayers.find((v) => v.id === r.layerId);
+        b.geometryLayerName = S?.title ?? S?.id, b.geometryLayerId = r.layerId, b.geometryWhere = r.where;
+      } else U(r) && (b.point = r.point);
       return {
         tool: "queryFeatures",
         layerName: l,
         summary: "Geometry lookup failed",
-        details: g
+        details: b
       };
     }
-    if (!m.geometry) {
-      const g = {};
-      if (L(t)) {
-        const T = r.map?.allLayers.find(($) => $.id === t.layerId);
-        g.error = `No features found matching: ${t.where}`, g.geometryLayerName = T?.title ?? T?.id, g.geometryLayerId = t.layerId, g.geometryWhere = t.where;
-      } else B(t) && (g.error = "Failed to create point geometry", g.point = t.point);
+    if (!w.geometry) {
+      const b = {};
+      if (j(r)) {
+        const S = t.map?.allLayers.find((v) => v.id === r.layerId);
+        b.error = `No features found matching: ${r.where}`, b.geometryLayerName = S?.title ?? S?.id, b.geometryLayerId = r.layerId, b.geometryWhere = r.where;
+      } else U(r) && (b.error = "Failed to create point geometry", b.point = r.point);
       return {
         tool: "queryFeatures",
         layerName: l,
         summary: "No features found for geometry filter",
-        details: g
+        details: b
       };
     }
-    i = m.geometry;
-  } else a && (i = r.extent.clone());
-  const c = le(n, e.outFields, a ?? !1), u = o.objectIdField, d = o.createQuery();
-  d.where = K(o.definitionExpression, e.where || "1=1"), d.outFields = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, u])], d.orderByFields = e.orderByFields, i && (d.geometry = i, d.spatialRelationship = "intersects"), t?.distance && (d.distance = t.distance), t?.units && (d.units = t.units), d.outSpatialReference = r.spatialReference;
-  let p, h;
+    i = w.geometry;
+  } else a && (i = t.extent.clone());
+  const c = [
+    .../* @__PURE__ */ new Set([...e.outFields, ...La(e.orderByFields)])
+  ], u = le(n, c, a ?? !1), d = o.objectIdField, p = o.createQuery();
+  p.where = K(o.definitionExpression, e.where || "1=1"), p.outFields = e.outFields.includes("*") ? ["*"] : [.../* @__PURE__ */ new Set([...e.outFields, d])], p.orderByFields = e.orderByFields, i && (p.geometry = i, p.spatialRelationship = "intersects"), r?.distance && (p.distance = r.distance), r?.units && (p.units = r.units), p.outSpatialReference = t.spatialReference;
+  let m, y;
   try {
-    p = c ? await n.queryFeatureCount(d) : await o.queryFeatureCount(d), p > 0 && p <= ee && (h = c ? await n.queryFeatures(d) : await o.queryFeatures(d));
-  } catch (m) {
-    console.warn("Client-side query failed, falling back to server:", m), p = await o.queryFeatureCount(d), p > 0 && p <= ee && (h = await o.queryFeatures(d));
+    m = u ? await n.queryFeatureCount(p) : await o.queryFeatureCount(p), m > 0 && m <= ee && (y = u ? await n.queryFeatures(p) : await o.queryFeatures(p));
+  } catch (w) {
+    console.warn("Client-side query failed, falling back to server:", w), m = await o.queryFeatureCount(p), m > 0 && m <= ee && (y = await o.queryFeatures(p));
   }
-  const { objectIds: f, attributes: y } = h ? Ee(o, h, r.timeZone) : { objectIds: void 0, attributes: void 0 };
+  const { objectIds: f, attributes: h } = y ? Ee(o, y, t.timeZone) : { objectIds: void 0, attributes: void 0 };
   return {
     tool: "queryFeatures",
     layerName: l,
-    summary: `${p} features found`,
+    summary: `${m} features found`,
     details: {
-      totalCount: p,
+      totalCount: m,
       where: e.where,
       orderByFields: e.orderByFields,
       outFields: e.outFields,
-      ...f && { objectIds: f, objectIdField: u },
-      ...y && { attributes: y },
-      ...p > ee && {
-        note: `${p} features found.`
+      ...f && { objectIds: f, objectIdField: d },
+      ...h && { attributes: h },
+      ...m > ee && {
+        note: `${m} features found.`
       }
     }
   };
 };
-async function ja({
+async function Ga({
   targetLayer: e,
-  geometryFilter: r,
-  useCurrentExtent: t
+  geometryFilter: t,
+  useCurrentExtent: r
 }, a) {
-  const { mapView: o } = N(a), n = await Aa(e, o, r, t);
+  const { mapView: o } = N(a), n = await ja(e, o, t, r);
   return JSON.stringify(n, null, 2);
 }
-const La = s.object({
+const Oa = s.object({
   layerId: s.string().describe("The layerId of the layer containing the geometry by which to filter."),
   where: s.string().describe("The SQL-92 where clause representing the features from which to filter."),
   distance: s.number().optional().describe("The buffer distance around the geometry."),
   units: F.optional().describe("The units for the distance buffer.")
-}), Ga = s.object({
+}), Ma = s.object({
   point: s.object({
     x: s.number().describe("X coordinate (longitude) from navigation result"),
     y: s.number().describe("Y coordinate (latitude) from navigation result"),
@@ -1891,7 +1900,7 @@ const La = s.object({
   }).describe("Point coordinates from a previous navigation/geocoding result"),
   distance: s.number().optional().describe("Optional buffer distance around the point."),
   units: F.optional().describe("The units for the distance buffer.")
-}), Oa = s.object({
+}), Qa = s.object({
   targetLayer: s.object({
     layerId: s.string().describe("The layerId of the layer containing the field from which to get a value."),
     where: s.string().describe(
@@ -1904,13 +1913,13 @@ const La = s.object({
       ).default("*")
     )
   }),
-  geometryFilter: s.union([La, Ga]).optional().describe(
+  geometryFilter: s.union([Oa, Ma]).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: s.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)."
   )
-}), Ma = w(ja, {
+}), _a = g(Ga, {
   name: "queryFeatures",
   description: `Queries features from a layer. Returns the total count of matching features, plus individual feature attributes if ≤25 features match. 
 
@@ -1922,11 +1931,11 @@ 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: Oa
-}), Qa = [xa, ka, Pa, Ma], Jn = [ca, ta, Yr], _a = new nt(Qa, { handleToolErrors: !1 });
-async function Zn(e, r) {
-  const { messages: t } = await _a.invoke({ messages: e.dataExplorationMessages }, r), a = [], o = [];
-  for (const n of t) {
+  schema: Qa
+}), Wa = [xa, ka, Aa, _a], Yn = [ca, ta, Yr], Va = new nt(Wa, { handleToolErrors: !1 });
+async function Xn(e, t) {
+  const { messages: r } = await Va.invoke({ messages: e.dataExplorationMessages }, t), a = [], o = [];
+  for (const n of r) {
     const l = n.content;
     let i;
     typeof l != "string" && (i = {
@@ -1952,63 +1961,63 @@ async function Zn(e, r) {
     }
     a.push(i), i.details && typeof i.details == "object" && "error" in i.details ? o.push(`- ${i.tool}: Error - ${String(i.details.error)}`) : o.push(`- ${i.layerName}: ${i.summary}`);
   }
-  return await S({ text: `Finished executing layer query tool: ${o.join(", ")}` }, r), {
+  return await x({ text: `Finished executing layer query tool: ${o.join(", ")}` }, t), {
     ...e,
-    dataExplorationMessages: [...e.dataExplorationMessages, ...t],
+    dataExplorationMessages: [...e.dataExplorationMessages, ...r],
     queryResponse: a,
     status: "success",
-    summary: o.length > 0 ? Ut(o.join(`
+    summary: o.length > 0 ? Bt(o.join(`
 `)) : "Query executed."
   };
 }
-const Yn = b.Root({
+const ei = T.Root({
   ...H(),
   // internal to the help agent
-  helpInternalState: b({
-    reducer: j,
+  helpInternalState: T({
+    reducer: L,
     default: () => ({
       toolCallMessage: void 0
     })
   })
-}), Wa = (e, r) => {
-  const t = Array.from(e.values()).find(
-    ({ layerItem: n }) => n.title?.toLowerCase().includes(r.toLowerCase())
+}), Ba = (e, t) => {
+  const r = Array.from(e.values()).find(
+    ({ layerItem: n }) => n.title?.toLowerCase().includes(t.toLowerCase())
   );
-  if (!t) {
+  if (!r) {
     const n = Array.from(e.values()).map((l) => l.layerItem.title).join(", ");
-    return `Could not find a layer matching "${r}". Available layers: ${n}`;
+    return `Could not find a layer matching "${t}". Available layers: ${n}`;
   }
-  const a = Array.from(t.fieldRegistry.values()), o = a.map((n) => `- **${n.alias || n.name}** (\`${n.name}\`, ${n.type})${n.description ? `: ${n.description}` : ""}`).join(`
+  const a = Array.from(r.fieldRegistry.values()), o = a.map((n) => `- **${n.alias || n.name}** (\`${n.name}\`, ${n.type})${n.description ? `: ${n.description}` : ""}`).join(`
 `);
-  return `**${t.layerItem.title}** has ${a.length} field(s):
+  return `**${r.layerItem.title}** has ${a.length} field(s):
 
 ${o}`;
-}, Va = async ({ layerTitle: e }, r) => {
-  const t = xe(r, "layersAndFieldsRegistry");
-  return Wa(t, e);
-}, Xn = w(Va, {
+}, Ua = async ({ layerTitle: e }, t) => {
+  const r = xe(t, "layersAndFieldsRegistry");
+  return Ba(r, e);
+}, ti = g(Ua, {
   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: s.object({
     layerTitle: s.string().describe("The title or partial title of the layer to list fields for.")
   })
-}), ei = b.Root({
+}), ri = T.Root({
   ...H(),
-  intent: b({
-    reducer: (e, r) => r
+  intent: T({
+    reducer: (e, t) => t
   }),
-  arcgisKnowledgeMessages: b({
+  arcgisKnowledgeMessages: T({
     reducer: be,
     default: () => []
   }),
-  arcgisKnowledgeToolResult: b({
-    reducer: (e, r) => r,
+  arcgisKnowledgeToolResult: T({
+    reducer: (e, t) => t,
     default: () => null
   })
 });
 function ce(e) {
-  const r = e.map?.allLayers.filter((t) => t.type === "knowledge-graph");
-  if (!r || r?.length !== 1)
+  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 q(e) {
@@ -2018,29 +2027,29 @@ async function Z(e) {
   !e || q(e) || !e.map?.diagramNodesExtent || await e.goTo(e.map.diagramNodesExtent);
 }
 function O(e) {
-  const t = e?.configurable?.context;
-  if (!t || typeof t != "object")
+  const r = e?.configurable?.context;
+  if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
-  if (!("view" in t))
+  if (!("view" in r))
     throw new Error("View context missing");
-  const a = t.view;
+  const a = r.view;
   return a.map && !("activeLinkChartLayer" in a.map) && ce(a), {
     view: a
   };
 }
-function ti(e) {
-  const t = e?.configurable?.context;
+function ai(e) {
+  const r = e?.configurable?.context;
   if (Fe(e) === "knowledgeGraph")
     return "knowledgeGraph";
-  const o = t.view;
+  const o = r.view;
   return q(o) ? (ce(o), "map") : "linkChart";
 }
 async function M(e) {
-  const t = e?.configurable?.context;
+  const r = e?.configurable?.context;
   if (Fe(e) === "knowledgeGraph")
-    return t;
+    return r;
   {
-    const o = t.view.map;
+    const o = r.view.map;
     if (o && "activeLinkChartLayer" in o) {
       const n = o.knowledgeGraph?.url;
       if (!n)
@@ -2049,8 +2058,8 @@ async function M(e) {
         knowledgeGraph: await fe(n)
       };
     } else {
-      ce(t.view);
-      const l = (t.view.map?.allLayers.find(
+      ce(r.view);
+      const l = (r.view.map?.allLayers.find(
         (c) => c.type === "knowledge-graph"
       )).url;
       if (!l)
@@ -2062,20 +2071,20 @@ async function M(e) {
   }
 }
 function Fe(e) {
-  const t = e?.configurable?.context;
-  if (!t || typeof t != "object")
+  const r = e?.configurable?.context;
+  if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
-  if ("knowledgeGraph" in t && "view" in t)
+  if ("knowledgeGraph" in r && "view" in r)
     throw new Error("Knowledge Graph context should only have a view or knowledgeGraph, but never both.");
-  if ("knowledgeGraph" in t)
+  if ("knowledgeGraph" in r)
     return "knowledgeGraph";
-  if ("view" in t)
+  if ("view" in r)
     return "view";
   throw new Error("ArcgisKnowledgeAgent context must have either a view or knowledgeGraph property.");
 }
-class Ua {
-  constructor(r) {
-    this.dataModel = r, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = ue.fromDataModel(r);
+class Ka {
+  constructor(t) {
+    this.dataModel = t, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = ue.fromDataModel(t);
   }
 }
 class ue {
@@ -2087,25 +2096,25 @@ class ue {
       }
     };
   }
-  static fromDataModel(r) {
-    const t = new ue();
-    for (const a of r.entityTypes)
-      t.entityTypes.push(G.fromEntityType(a));
-    for (const a of r.relationshipTypes)
-      t.relationshipTypes.push(Ba.fromRelationshipType(a));
-    return t.identifierInfo = {
+  static fromDataModel(t) {
+    const r = new ue();
+    for (const a of t.entityTypes)
+      r.entityTypes.push(G.fromEntityType(a));
+    for (const a of t.relationshipTypes)
+      r.relationshipTypes.push(Ha.fromRelationshipType(a));
+    return r.identifierInfo = {
       mappingInfo: {
-        identifierMapsTo: Ka(
-          r.identifierInfo.identifierMappingInfo.identifierInfoType
+        identifierMapsTo: Ja(
+          t.identifierInfo.identifierMappingInfo.identifierInfoType
         ),
-        identifierPropertyName: r.identifierInfo.identifierMappingInfo.uniformPropertyIdentifier.identifierPropertyName
+        identifierPropertyName: t.identifierInfo.identifierMappingInfo.uniformPropertyIdentifier.identifierPropertyName
       }
-    }, t.spatialReference = JSON.parse(JSON.stringify(r.spatialReference)), t;
+    }, r.spatialReference = JSON.parse(JSON.stringify(t.spatialReference)), r;
   }
   // Generates a short summary of the types in the data model for LLM consumption.
-  static getDataModelTypesSummary(r) {
-    const t = r.entityTypes.map((o) => o.name).join(", "), a = r.relationshipTypes.map((o) => o.name).join(", ");
-    return `Entity Types: ${t}.
+  static getDataModelTypesSummary(t) {
+    const r = t.entityTypes.map((o) => o.name).join(", "), a = t.relationshipTypes.map((o) => o.name).join(", ");
+    return `Entity Types: ${r}.
  Relationship Types: ${a}.`;
   }
 }
@@ -2113,42 +2122,42 @@ class G {
   constructor() {
     this.name = "", this.properties = [];
   }
-  static fromEntityType(r) {
-    const t = new G();
-    t.name = r.name, t.alias = r.alias ? r.alias : void 0, t.role = Ha(r.role);
-    for (const a of r.properties) {
+  static fromEntityType(t) {
+    const r = new G();
+    r.name = t.name, r.alias = t.alias ? t.alias : void 0, r.role = Za(t.role);
+    for (const a of t.properties) {
       const o = {
         name: a.name,
         alias: a.alias ? a.alias : void 0,
         fieldType: a.fieldType,
-        role: Ja(a.role),
+        role: Ya(a.role),
         geometryDef: a.fieldType === "esriFieldTypeGeometry" ? {
           geometryType: a.geometryType ?? "esriGeometryAny",
           hasM: a.hasM ? a.hasM : void 0,
           hasZ: a.hasZ ? a.hasZ : void 0
         } : void 0
       };
-      t.properties.push(o);
+      r.properties.push(o);
     }
-    return t;
+    return r;
   }
 }
-class Ba extends G {
+class Ha extends G {
   constructor() {
     super(...arguments), this.observedEndPoints = [];
   }
-  static fromRelationshipType(r) {
-    const t = G.fromEntityType(r);
-    t.observedEndPoints = [];
-    for (const a of r.endPoints)
-      t.observedEndPoints.push({
+  static fromRelationshipType(t) {
+    const r = G.fromEntityType(t);
+    r.observedEndPoints = [];
+    for (const a of t.endPoints)
+      r.observedEndPoints.push({
         originEntityType: a.originEntityType,
         destinationEntityType: a.destinationEntityType
       });
-    return t;
+    return r;
   }
 }
-const Ka = (e) => {
+const Ja = (e) => {
   switch (e) {
     case "esriIdentifierInfoTypeUNSPECIFIED":
       return "UNSPECIFIED";
@@ -2159,7 +2168,7 @@ const Ka = (e) => {
     default:
       return e;
   }
-}, Ha = (e) => {
+}, Za = (e) => {
   switch (e) {
     case "Regular":
       return "esriGraphNamedObjectRegular";
@@ -2171,7 +2180,7 @@ const Ka = (e) => {
       return e;
   }
 };
-function Ja(e) {
+function Ya(e) {
   switch (e) {
     case "esriGraphPropertyRegular":
       return "Regular";
@@ -2212,28 +2221,28 @@ function Ja(e) {
 function Y(e) {
   return e?.signal;
 }
-async function Za(e, r) {
-  const t = await U("arcgis_knowledge_cypher_query_prompt");
-  return r ? `${e} ${t}
+async function Xa(e, t) {
+  const r = await B("arcgis_knowledge_cypher_query_prompt");
+  return t ? `${e} ${r}
 
 Your previous attempt to generate a cypher query failed. See the details below and generate a new cypher query that avoids this error.
 
-Attempt Number: ${r.attemptCount}
-Execution Error: ${r.executionError}
+Attempt Number: ${t.attemptCount}
+Execution Error: ${t.executionError}
 Failed Query:
-${r.failedGraphQuery}` : `${e} ${t}`;
+${t.failedGraphQuery}` : `${e} ${r}`;
 }
-async function Ya(e, r, t, a) {
-  const { graphQuery: o, explanation: n } = await de(e, r, t, a);
+async function eo(e, t, r, a) {
+  const { graphQuery: o, explanation: n } = await de(e, t, r, a);
   return { graphQuery: o, explanation: n };
 }
-async function de(e, r, t, a, o) {
+async function de(e, t, r, a, o) {
   const n = {
-    message: await Za(e, o),
-    context: new Ua(r)
+    message: await Xa(e, o),
+    context: new Ka(t)
   }, l = Y(a);
-  await S({ text: "Attempting to generate a cypher query from your prompt..." }, a);
-  const i = await he(`${t}/chat`, {
+  await x({ text: "Attempting to generate a cypher query from your prompt..." }, a);
+  const i = await me(`${r}/chat`, {
     method: "post",
     body: JSON.stringify(n),
     headers: {
@@ -2248,13 +2257,13 @@ async function de(e, r, t, a, o) {
     });
   let c = !1;
   const u = Date.now();
-  let d = i.data.sequenceNumber, p = "", h = "", f = 1;
+  let d = i.data.sequenceNumber, p = "", m = "", y = 1;
   for (; !c; ) {
-    await new Promise((m) => setTimeout(m, 1e3)), await S(
-      { text: `Periodically requesting status of job from ArcGIS AI Services${"...".substring(0, f)}` },
+    await new Promise((h) => setTimeout(h, 1e3)), await x(
+      { text: `Periodically requesting status of job from ArcGIS AI Services${"...".substring(0, y)}` },
       a
-    ), f = f % 3 + 1;
-    const y = await he(`${t}/chat`, {
+    ), y = y % 3 + 1;
+    const f = await me(`${r}/chat`, {
       method: "post",
       body: JSON.stringify({
         conversationId: i.data.conversationId,
@@ -2267,75 +2276,75 @@ async function de(e, r, t, a, o) {
       },
       signal: l
     });
-    if (y.httpStatus !== 200)
-      throw new Error(`Graph query service polling returned an error: ${y.httpStatus}`, {
-        cause: y.data
+    if (f.httpStatus !== 200)
+      throw new Error(`Graph query service polling returned an error: ${f.httpStatus}`, {
+        cause: f.data
       });
-    if (y.data.context?.kind) {
-      if (y.data.context.kind !== "GraphQueryGenerationResponse")
-        throw new Error(`Unexpected response from graph query service polling. Message: ${y.data.message}`, {
-          cause: y.data
+    if (f.data.context?.kind) {
+      if (f.data.context.kind !== "GraphQueryGenerationResponse")
+        throw new Error(`Unexpected response from graph query service polling. Message: ${f.data.message}`, {
+          cause: f.data
         });
-      p = y.data.context.graphQuery, h = y.data.message || "", c = !0;
-    } else if (!y.data.hasMore)
+      p = f.data.context.graphQuery, m = f.data.message || "", c = !0;
+    } else if (!f.data.hasMore)
       c = !0;
     else if (Date.now() - u > 6e4)
       throw new Error("Graph query service polling timed out after 1 minute.");
-    d = y.data.sequenceNumber;
+    d = f.data.sequenceNumber;
   }
-  return { graphQuery: p, explanation: h };
+  return { graphQuery: p, explanation: m };
 }
-function Xa(e, r) {
-  z(e, (t) => {
-    r.set(`${t.typeName}__${t.id}`, {
-      id: t.id,
-      typeName: t.typeName
+function to(e, t) {
+  z(e, (r) => {
+    t.set(`${r.typeName}__${r.id}`, {
+      id: r.id,
+      typeName: r.typeName
     });
   });
 }
-function z(e, r) {
+function z(e, t) {
   if (!(!e || typeof e != "object")) {
-    if (to(e))
-      for (const t of e.path)
-        z(t, r);
-    else if (eo(e))
-      r(e);
-    else if (Array.isArray(e))
-      for (const t of e)
-        z(t, r);
+    if (ao(e))
+      for (const r of e.path)
+        z(r, t);
     else if (ro(e))
-      for (const t of Object.values(e.properties ?? {}))
-        z(t, r);
+      t(e);
+    else if (Array.isArray(e))
+      for (const r of e)
+        z(r, t);
+    else if (oo(e))
+      for (const r of Object.values(e.properties ?? {}))
+        z(r, t);
   }
 }
-function eo(e) {
+function ro(e) {
   return !e || typeof e != "object" || Array.isArray(e) ? !1 : "id" in e && "typeName" in e;
 }
-function to(e) {
+function ao(e) {
   return !e || typeof e != "object" || Array.isArray(e) ? !1 : e && "path" in e && Array.isArray(e.path);
 }
-function ro(e) {
+function oo(e) {
   return !e || typeof e != "object" || Array.isArray(e) || "id" in e ? !1 : "properties" in e && typeof e.properties == "object";
 }
-function ao(e, r) {
-  const t = [], a = [], o = [
-    [r.dataModel.entityTypes, t],
-    [r.dataModel.relationshipTypes, a]
+function no(e, t) {
+  const r = [], a = [], o = [
+    [t.dataModel.entityTypes, r],
+    [t.dataModel.relationshipTypes, a]
   ];
   for (const [n, l] of o)
     for (const i of n) {
       const c = e.getMemberIdsByType(i.name);
       l.push(...c);
     }
-  return { entityIds: t, relationshipIds: a };
+  return { entityIds: r, relationshipIds: a };
 }
-function oo(e, r) {
-  const t = { entityIds: new Array(), relationshipIds: new Array() }, a = [], n = e?.allLayers.find((c) => c.type === "knowledge-graph")?.inclusionModeDefinition;
+function io(e, t) {
+  const r = { entityIds: new Array(), relationshipIds: new Array() }, a = [], n = e?.allLayers.find((c) => c.type === "knowledge-graph")?.inclusionModeDefinition;
   if (!n)
-    return { allNamedTypesFullyDynamic: !0, bindParameters: t, nonDynamicTypes: a };
+    return { allNamedTypesFullyDynamic: !0, bindParameters: r, nonDynamicTypes: a };
   const l = [
-    [r.dataModel.entityTypes, t.entityIds],
-    [r.dataModel.relationshipTypes, t.relationshipIds]
+    [t.dataModel.entityTypes, r.entityIds],
+    [t.dataModel.relationshipTypes, r.relationshipIds]
   ];
   let i = !0;
   for (const [c, u] of l)
@@ -2347,58 +2356,58 @@ function oo(e, r) {
       }
       if (!p.useAllData) {
         i = !1, a.push(d.name);
-        for (const [h] of p.members || [])
-          u.push(h);
+        for (const [m] of p.members || [])
+          u.push(m);
       }
     }
-  return { allNamedTypesFullyDynamic: i, bindParameters: t, nonDynamicTypes: a };
+  return { allNamedTypesFullyDynamic: i, bindParameters: r, nonDynamicTypes: a };
 }
 const D = 3;
-function ke(e, r = 100) {
-  const t = {};
+function ke(e, t = 100) {
+  const r = {};
   for (const a of Object.entries(e.properties ?? {})) {
     const [o, n] = a;
-    typeof n == "string" && n.length > r ? t[o] = `${n.slice(0, r)}... (truncated, original length: ${n.length})` : t[o] = n;
+    typeof n == "string" && n.length > t ? r[o] = `${n.slice(0, t)}... (truncated, original length: ${n.length})` : r[o] = n;
   }
-  return e.properties = t, e;
+  return e.properties = r, e;
 }
 function P(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 no = async ({
+const so = async ({
   kg: e,
-  queryParams: r,
-  targetStructure: t,
+  queryParams: t,
+  targetStructure: r,
   targetStructureReducer: a,
   requestOptions: o,
   queryRowLimit: n,
   queryTimeoutMs: l
 }) => {
-  let i = null, c = t;
+  let i = null, c = r;
   const u = new AbortController(), d = o?.signal, p = () => {
     u.abort(d?.reason);
   };
   d && (d.aborted ? u.abort(d.reason) : d.addEventListener("abort", p, { once: !0 }));
   try {
-    const h = await yt(e, r, o);
-    i = h.resultHeader;
-    const f = h.resultRowsStream.getReader();
-    let y = 0;
-    const m = Date.now(), g = !1;
+    const m = await yt(e, t, o);
+    i = m.resultHeader;
+    const y = m.resultRowsStream.getReader();
+    let f = 0;
+    const h = Date.now(), w = !1;
     for (; ; ) {
-      const { done: T, value: $ } = await f.read();
-      if (T)
+      const { done: b, value: S } = await y.read();
+      if (b)
         break;
-      if (!g && l && Date.now() - m > l)
+      if (!w && l && Date.now() - h > l)
         return u.abort(), { type: "timeout" };
-      for (const v of $) {
-        if (y++, n && y > n)
+      for (const v of S) {
+        if (f++, n && f > n)
           return u.abort(), { type: "success", rowLimitReached: !0, resultHeader: i, processedResult: c };
         c = a(c, v);
       }
     }
-  } catch (h) {
-    return u.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: P(h), error: h };
+  } catch (m) {
+    return u.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: P(m), error: m };
   } finally {
     d?.removeEventListener("abort", p);
   }
@@ -2406,8 +2415,8 @@ const no = async ({
 };
 async function Ne({
   prompt: e,
-  bindParameters: r,
-  kg: t,
+  bindParameters: t,
+  kg: r,
   graphQueryServiceUrl: a,
   targetStructure: o,
   targetStructureReducer: n,
@@ -2418,69 +2427,69 @@ async function Ne({
 }) {
   let d;
   for (let p = 1; p <= D; p++) {
-    let h;
+    let m;
     try {
-      h = await de(e, t.dataModel, a, u, d);
-    } catch (m) {
+      m = await de(e, r.dataModel, a, u, d);
+    } catch (h) {
       return {
         type: "generation-error",
-        errorMessage: P(m),
-        error: m
+        errorMessage: P(h),
+        error: h
       };
     }
-    await S(
+    await x(
       {
-        text: `Attempting to execute query: ${h.graphQuery.substring(0, 500)}${h.graphQuery.length > 500 ? "..." : ""}`
+        text: `Attempting to execute query: ${m.graphQuery.substring(0, 500)}${m.graphQuery.length > 500 ? "..." : ""}`
       },
       u
     );
-    const f = await no({
-      kg: t,
+    const y = await so({
+      kg: r,
       queryParams: new Se({
-        openCypherQuery: h.graphQuery,
-        bindParameters: r
+        openCypherQuery: m.graphQuery,
+        bindParameters: t
       }),
       targetStructure: o,
       targetStructureReducer: n,
       requestOptions: l,
       queryRowLimit: i,
       queryTimeoutMs: c
-    }), y = f.type === "aborted" ? "Query execution was aborted." : f.type === "timeout" ? "Query execution timed out." : f.type === "error" ? `Query failed with error: ${f.errorMessage}` : "";
-    if (f.type === "success")
+    }), f = y.type === "aborted" ? "Query execution was aborted." : y.type === "timeout" ? "Query execution timed out." : y.type === "error" ? `Query failed with error: ${y.errorMessage}` : "";
+    if (y.type === "success")
       return {
         type: "success",
-        graphQuery: h.graphQuery,
-        explanation: h.explanation,
-        rowLimitReached: f.rowLimitReached,
-        resultHeader: f.resultHeader,
-        processedResult: f.processedResult
+        graphQuery: m.graphQuery,
+        explanation: m.explanation,
+        rowLimitReached: y.rowLimitReached,
+        resultHeader: y.resultHeader,
+        processedResult: y.processedResult
       };
-    if (f.type === "aborted")
+    if (y.type === "aborted")
       return {
         type: "aborted",
-        errorMessage: y,
-        graphQuery: h.graphQuery,
-        explanation: h.explanation
+        errorMessage: f,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       };
     if (p >= D)
-      return f.type === "timeout" ? {
+      return y.type === "timeout" ? {
         type: "timeout",
-        errorMessage: y,
-        graphQuery: h.graphQuery,
-        explanation: h.explanation
+        errorMessage: f,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       } : {
         type: "execution-error",
-        errorMessage: y,
-        error: f.error,
-        graphQuery: h.graphQuery,
-        explanation: h.explanation
+        errorMessage: f,
+        error: y.error,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       };
     d = {
-      failedGraphQuery: h.graphQuery,
-      executionError: y,
+      failedGraphQuery: m.graphQuery,
+      executionError: f,
       attemptCount: p
-    }, await S(
-      { text: `Attempt ${p} failed with error: ${y}. Retrying...` },
+    }, await x(
+      { text: `Attempt ${p} failed with error: ${f}. Retrying...` },
       u
     );
   }
@@ -2488,43 +2497,43 @@ async function Ne({
     `Failed to execute generated cypher due to an unexpected error after ${D} attempts.`
   );
 }
-const io = async ({
+const lo = async ({
   kg: e,
-  searchQuery: r,
-  typeCategoryFilter: t,
+  searchQuery: t,
+  typeCategoryFilter: r,
   namedTypesFilter: a,
   searchResultLimit: o,
   requestOptions: n
 }) => {
   const l = [];
-  let i = [t];
-  t === "both" && !e.serviceDefinition.serviceCapabilities.searchCapabilities.searchTypeFilterCapabilities.includes("esriTypeBoth") && (i = ["entity", "relationship"]);
+  let i = [r];
+  r === "both" && !e.serviceDefinition.serviceCapabilities.searchCapabilities.searchTypeFilterCapabilities.includes("esriTypeBoth") && (i = ["entity", "relationship"]);
   const c = o ?? 1 / 0;
   try {
     for (const u of i) {
       const d = c - l.length;
       if (d <= 0)
         break;
-      const f = (await ft(
+      const y = (await ft(
         e,
         new gt({
-          searchQuery: r,
+          searchQuery: t,
           typeCategoryFilter: u,
           namedTypesFilter: a ?? void 0,
           num: d
         }),
         n
       )).resultRowsStream.getReader();
-      let y = !1;
-      for (; !y; ) {
-        const { done: m, value: g } = await f.read();
-        if (m) {
-          y = !0;
+      let f = !1;
+      for (; !f; ) {
+        const { done: h, value: w } = await y.read();
+        if (h) {
+          f = !0;
           break;
         }
-        for (const T of g)
-          for (const $ of T)
-            l.push($);
+        for (const b of w)
+          for (const S of b)
+            l.push(S);
       }
     }
   } catch (u) {
@@ -2542,13 +2551,13 @@ const io = async ({
 }, qe = "IMPORTANT: The generated cypher query must return entire entities and relationships ONLY.";
 async function Ie({
   prompt: e,
-  view: r,
-  knowledgeGraph: t,
+  view: t,
+  knowledgeGraph: r,
   includeReturnEntityAndRelationshipContext: a = !1
 }) {
   const o = [e];
-  if (a && o.push(qe), !q(r)) {
-    const d = await U("arcgis_knowledge_current_lc_context"), p = ao(r.map, t);
+  if (a && o.push(qe), !q(t)) {
+    const d = await B("arcgis_knowledge_current_lc_context"), p = no(t.map, r);
     return o.push(d), {
       enhancedPrompt: o.join(`
 
@@ -2557,9 +2566,9 @@ async function Ie({
       allNamedTypesFullyDynamic: !1
     };
   }
-  const n = r.map, { allNamedTypesFullyDynamic: l, bindParameters: i, nonDynamicTypes: c } = oo(
+  const n = t.map, { allNamedTypesFullyDynamic: l, bindParameters: i, nonDynamicTypes: c } = io(
     n,
-    t
+    r
   );
   if (l)
     return {
@@ -2569,7 +2578,7 @@ async function Ie({
       bindParameters: i,
       allNamedTypesFullyDynamic: !0
     };
-  const u = (await U("arcgis_knowledge_current_map_context")).replaceAll(
+  const u = (await B("arcgis_knowledge_current_map_context")).replaceAll(
     "{nonDynamicTypes}",
     JSON.stringify(c)
   );
@@ -2581,17 +2590,17 @@ async function Ie({
     allNamedTypesFullyDynamic: l
   };
 }
-async function so(e, r, t, a, o, n) {
+async function co(e, t, r, a, o, n) {
   const { view: l } = o, i = await Ne({
     prompt: e,
-    bindParameters: r,
-    kg: t,
+    bindParameters: t,
+    kg: r,
     graphQueryServiceUrl: a,
     targetStructure: /* @__PURE__ */ new Map(),
-    targetStructureReducer: (h, f) => {
-      for (const y of f)
-        Xa(y, h);
-      return h;
+    targetStructureReducer: (m, y) => {
+      for (const f of y)
+        to(f, m);
+      return m;
     },
     requestOptions: {
       signal: Y(n),
@@ -2600,32 +2609,32 @@ async function so(e, r, t, a, o, n) {
     config: n
   });
   if (i.type !== "success") {
-    const h = i.type === "generation-error" ? i.errorMessage : `${i.errorMessage} Cypher query: ${i.graphQuery}`;
-    throw new Error(`Failed to add records to the link chart. ${h}`);
+    const m = i.type === "generation-error" ? i.errorMessage : `${i.errorMessage} Cypher query: ${i.graphQuery}`;
+    throw new Error(`Failed to add records to the link chart. ${m}`);
   }
   const { graphQuery: c, explanation: u, processedResult: d } = i, p = Array.from(d.values());
-  return await S(
+  return await x(
     {
       text: `Query Results parsed into ${p.length} unique relationships and entities.  Atempting to add to link chart...`
     },
     n
   ), !q(l) && l?.map ? (await l.map.addRecords(p), await Z(l), { generatedQuery: c, explanation: u, addedIdTypePairs: p }) : (await l?.map?.allLayers.find(
-    (f) => f.type === "knowledge-graph"
+    (y) => y.type === "knowledge-graph"
   )?.addRecords(p), { generatedQuery: c, explanation: u, addedIdTypePairs: p });
 }
-const W = "addRecords", lo = s.object({
+const W = "addRecords", uo = s.object({
   prompt: s.string().describe(
     "The user's inquiry and context required in order to generate a cypher query that will be used to add records to the link chart."
   )
-}), co = async ({ prompt: e }, r) => {
-  const { knowledgeGraph: t } = await M(r), a = O(r), { view: o } = a, l = k.getDefault().helperServices, {
+}), po = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), a = O(t), { view: o } = a, l = k.getDefault().helperServices, {
     enhancedPrompt: i,
     bindParameters: c,
     allNamedTypesFullyDynamic: u
   } = await Ie({
     prompt: e,
     view: o,
-    knowledgeGraph: t,
+    knowledgeGraph: r,
     includeReturnEntityAndRelationshipContext: !0
   });
   if (u)
@@ -2640,24 +2649,24 @@ const W = "addRecords", lo = s.object({
       }
     };
   try {
-    const { generatedQuery: d, explanation: p, addedIdTypePairs: h } = await so(
+    const { generatedQuery: d, explanation: p, addedIdTypePairs: m } = await co(
       i,
       c,
-      t,
+      r,
       `${l.aiAssistantServices.url}${l.aiAssistantServices.graphQueryAssistant}`,
       a,
-      r
+      t
     );
     return {
       toolName: W,
       status: "success",
       summary: `Records added successfully. Cypher Query used: ${d}
 
-Number of records added: ${h.length}`,
+Number of records added: ${m.length}`,
       details: {
         generatedQuery: d,
         explanation: p,
-        addedIdTypePairs: h
+        addedIdTypePairs: m
       }
     };
   } catch (d) {
@@ -2669,7 +2678,7 @@ Number of records added: ${h.length}`,
       error: d
     };
   }
-}, ri = w(co, {
+}, oi = g(po, {
   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. "add to new link chart" is not a valid prompt for this tool. 
     
@@ -2682,12 +2691,12 @@ Number of records added: ${h.length}`,
     - "connect company x and company y"
     - "connect all buildings on the link chart"
     `,
-  schema: lo
+  schema: uo
 });
-async function uo(e, r) {
-  return await r.map?.applyLayout(e), await Z(r), { appliedLayout: e };
+async function mo(e, t) {
+  return await t.map?.applyLayout(e), await Z(t), { appliedLayout: e };
 }
-const re = "applyLayout", po = s.object({
+const re = "applyLayout", ho = s.object({
   layout: s.enum([
     "organic-standard",
     "organic-community",
@@ -2701,9 +2710,9 @@ const re = "applyLayout", po = s.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"
   )
-}), ho = async ({ layout: e }, r) => {
-  const { view: t } = O(r);
-  if (q(t))
+}), yo = async ({ layout: e }, t) => {
+  const { view: r } = O(t);
+  if (q(r))
     return {
       toolName: re,
       status: "error",
@@ -2711,7 +2720,7 @@ const re = "applyLayout", po = s.object({
       error: new Error()
     };
   {
-    const { appliedLayout: a } = await uo(e, t);
+    const { appliedLayout: a } = await mo(e, r);
     return {
       toolName: re,
       status: "success",
@@ -2721,19 +2730,19 @@ const re = "applyLayout", po = s.object({
       }
     };
   }
-}, ai = w(ho, {
+}, ni = g(yo, {
   name: re,
   description: "Apply a diagram layout to the link chart",
-  schema: po
+  schema: ho
 });
-async function mo(e, r) {
-  return r.map?.changeNonspatialDataDisplay(e), await Z(r), { appliedNonspatialDataDisplayMode: e };
+async function fo(e, t) {
+  return t.map?.changeNonspatialDataDisplay(e), await Z(t), { appliedNonspatialDataDisplayMode: e };
 }
-const ae = "changeNonspatialVisibility", yo = s.object({
+const ae = "changeNonspatialVisibility", go = s.object({
   setting: s.enum(["hidden", "visible"]).describe("The setting of nonspatial visibility")
-}), fo = async ({ setting: e }, r) => {
-  const { view: t } = O(r);
-  if (q(t))
+}), wo = async ({ setting: e }, t) => {
+  const { view: r } = O(t);
+  if (q(r))
     return {
       toolName: ae,
       status: "error",
@@ -2741,7 +2750,7 @@ const ae = "changeNonspatialVisibility", yo = s.object({
       error: new Error()
     };
   {
-    const { appliedNonspatialDataDisplayMode: a } = await mo(e, t);
+    const { appliedNonspatialDataDisplayMode: a } = await fo(e, r);
     return {
       toolName: ae,
       status: "success",
@@ -2751,30 +2760,30 @@ const ae = "changeNonspatialVisibility", yo = s.object({
       }
     };
   }
-}, oi = w(fo, {
+}, ii = g(wo, {
   name: ae,
   description: "Change whether or not nonspatial data is visible in the link chart.  The value must be either 'hidden' or 'visible'.",
-  schema: yo
+  schema: go
 });
-async function go(e, r, t, a, o) {
+async function bo(e, t, r, a, o) {
   let n, l = "";
   for (let i = 1; i <= D; i++) {
     const { graphQuery: c, explanation: u } = await de(
       e,
-      r.dataModel,
-      t,
+      t.dataModel,
+      r,
       o,
       n
     );
     try {
-      await S({ text: `Attempting to create link chart from derived query: ${c}` }, o);
-      const d = await mt.fromCypherQuery(
-        r,
+      await x({ text: `Attempting to create link chart from derived query: ${c}` }, o);
+      const d = await ht.fromCypherQuery(
+        t,
         new Se({
           openCypherQuery: c
         })
       );
-      await S({ text: "Link chart created successfully, loading..." }, o), await d.load();
+      await x({ text: "Link chart created successfully, loading..." }, o), await d.load();
       const p = a.map;
       return a.map = d, await a.when(), await Ae.whenOnce(() => !a.updating), d.entityCount === 0 && d.relationshipCount === 0 ? (a.map === d && (a.map = p), d.destroy(), {
         type: "error",
@@ -2797,7 +2806,7 @@ Explanation: ${u}`
         failedGraphQuery: c,
         executionError: p,
         attemptCount: i
-      }, await S(
+      }, await x(
         { text: `Attempt ${i} to create link chart failed with error: ${p}. Retrying ...` },
         o
       );
@@ -2808,12 +2817,12 @@ Explanation: ${u}`
     errorMessage: `Failed to create link chart after ${D} attempts. Last error: ${l}`
   };
 }
-const V = "createLinkChart", wo = s.object({
+const V = "createLinkChart", To = s.object({
   prompt: s.string().describe(
     "The user's inquiry and context required in order to generate a cypher query that will be used to create a link chart visualization. Only include information relevant to generating a cypher query. Do not suggest entity types, relationship types or properties. Do not include limits  or formatting instructions for the query results unless specifically requested by the user. The prompt should be focused on the data the user wants to see in the link chart, not how to generate it."
   )
-}), bo = async ({ prompt: e }, r) => {
-  const { knowledgeGraph: t } = await M(r), { view: a } = O(r);
+}), vo = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), { view: a } = O(t);
   if (q(a))
     return {
       toolName: V,
@@ -2822,14 +2831,14 @@ const V = "createLinkChart", wo = s.object({
       error: new Error()
     };
   {
-    const n = k.getDefault().helperServices, l = await go(
+    const n = k.getDefault().helperServices, l = await bo(
       `${e}
 
 ${qe}`,
-      t,
+      r,
       `${n.aiAssistantServices.url}${n.aiAssistantServices.graphQueryAssistant}`,
       a,
-      r
+      t
     );
     if (l.type === "error")
       return {
@@ -2852,57 +2861,57 @@ Explanation: ${c}`,
       }
     };
   }
-}, ni = w(bo, {
+}, si = g(vo, {
   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 using language like 'create new link chart' or 'add to new link chart'.",
-  schema: wo
-}), oe = "queryGraphData", To = s.object({
+  schema: To
+}), oe = "queryGraphData", So = s.object({
   prompt: s.string().describe(
     "The user's inquiry into the knowledge graph, from which a cypher query will be generated and executed to answer the inquiry. Only include entity types, relationship types or properties if they are provided in the user prompt or prior steps. Do not suggest entity types, relationship types or properties. Do not include limits, information on what to return, instructions on how to write the query, or formatting instructions for the query results unless specifically requested by the user."
   )
-}), vo = async ({ prompt: e }, r) => {
-  const { knowledgeGraph: t } = await M(r), o = k.getDefault().helperServices;
+}), xo = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), o = k.getDefault().helperServices;
   let n = e, l = null, i = null;
   try {
-    ({ view: i } = O(r));
+    ({ view: i } = O(t));
   } catch {
   }
   i && ({ enhancedPrompt: n, bindParameters: l } = await Ie({
     prompt: e,
     view: i,
-    knowledgeGraph: t,
+    knowledgeGraph: r,
     includeReturnEntityAndRelationshipContext: !1
   }));
   const c = await Ne({
     prompt: n,
     bindParameters: l,
-    kg: t,
+    kg: r,
     graphQueryServiceUrl: `${o.aiAssistantServices.url}${o.aiAssistantServices.graphQueryAssistant}`,
     targetStructure: new Array(),
-    targetStructureReducer: (g, T) => (g.push(T), g),
+    targetStructureReducer: (w, b) => (w.push(b), w),
     requestOptions: {
-      signal: Y(r),
-      timeout: r?.timeout
+      signal: Y(t),
+      timeout: t?.timeout
     },
-    config: r
+    config: t
   });
   if (c.type !== "success") {
-    const g = c.type === "generation-error" ? c.errorMessage : `${c.errorMessage} Cypher query: ${c.graphQuery}`;
+    const w = c.type === "generation-error" ? c.errorMessage : `${c.errorMessage} Cypher query: ${c.graphQuery}`;
     return {
       toolName: oe,
       status: "error",
-      errorMessage: `Failed to query the knowledge graph. ${g}`,
+      errorMessage: `Failed to query the knowledge graph. ${w}`,
       error: "error" in c ? c.error : null
     };
   }
-  const { graphQuery: u, explanation: d, processedResult: p, resultHeader: h } = c, f = h.headerKeys;
-  for (const g of p)
-    for (const T of g)
+  const { graphQuery: u, explanation: d, processedResult: p, resultHeader: m } = c, y = m.headerKeys;
+  for (const w of p)
+    for (const b of w)
       z(
-        T,
-        ($) => ke($)
+        b,
+        (S) => ke(S)
       );
-  const y = 50, m = p.slice(0, y).map((g) => JSON.stringify(g));
+  const f = 50, h = p.slice(0, f).map((w) => JSON.stringify(w));
   return {
     toolName: oe,
     status: "success",
@@ -2913,38 +2922,38 @@ ${u}
 \`\`\`
 
 Query Results:
-${m.length} result(s) found.
+${h.length} result(s) found.
 
-Column Headers: ${f.join(", ")}
+Column Headers: ${y.join(", ")}
 
-${m.length > y ? `Showing top ${y} results:
+${h.length > f ? `Showing top ${f} results:
 
 ` : `Results:
 
-`}${m.join(`
+`}${h.join(`
 `)}
 `,
     details: {
       generatedQuery: u,
       explanation: d,
-      resultHeader: h,
+      resultHeader: m,
       queryResults: p
     }
   };
-}, ii = w(vo, {
+}, li = g(xo, {
   name: oe,
   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: To
-}), ne = "generateCypher", So = s.object({
+  schema: So
+}), ne = "generateCypher", Ro = s.object({
   prompt: s.string().describe("The user's inquiry into the knowledge graph that needs to be translated into a cypher query.")
-}), xo = async ({ prompt: e }, r) => {
-  const { knowledgeGraph: t } = await M(r), o = k.getDefault().helperServices;
+}), $o = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), o = k.getDefault().helperServices;
   try {
-    const { graphQuery: n, explanation: l } = await Ya(
+    const { graphQuery: n, explanation: l } = await eo(
       e,
-      t.dataModel,
+      r.dataModel,
       `${o.aiAssistantServices.url}${o.aiAssistantServices.graphQueryAssistant}`,
-      r
+      t
     );
     return {
       toolName: ne,
@@ -2967,36 +2976,36 @@ Explanation: ${l}`,
       error: n
     };
   }
-}, si = w(xo, {
+}, ci = g($o, {
   name: ne,
   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: So
-}), Ro = (e) => {
-  const r = e.dataModel, t = /* @__PURE__ */ new Map();
-  for (const i of r.searchIndexes)
+  schema: Ro
+}), Co = (e) => {
+  const t = e.dataModel, r = /* @__PURE__ */ new Map();
+  for (const i of t.searchIndexes)
     if (i.supportedCategory !== "esriTypeMetaEntityProvenance")
       for (const [c, u] of i.searchProperties.entries()) {
-        const d = t.get(c) ?? /* @__PURE__ */ new Set();
-        u.propertyNames.forEach((p) => d.add(p)), t.set(c, d);
+        const d = r.get(c) ?? /* @__PURE__ */ new Set();
+        u.propertyNames.forEach((p) => d.add(p)), r.set(c, d);
       }
-  const a = r.entityTypes.filter((i) => t.has(i.name)), o = r.relationshipTypes.filter((i) => t.has(i.name)), n = `Entity Types:
-${a.map(({ name: i }) => `${i}: [${Array.from(t.get(i) ?? []).join(", ")}]`).join(`
+  const a = t.entityTypes.filter((i) => r.has(i.name)), o = t.relationshipTypes.filter((i) => r.has(i.name)), n = `Entity Types:
+${a.map(({ name: i }) => `${i}: [${Array.from(r.get(i) ?? []).join(", ")}]`).join(`
 `)}`, l = `Relationship Types:
-${o.map(({ name: i }) => `${i}: [${Array.from(t.get(i) ?? []).join(", ")}]`).join(`
+${o.map(({ name: i }) => `${i}: [${Array.from(r.get(i) ?? []).join(", ")}]`).join(`
 `)}`;
   return `${n}
 
 ${l}`;
 };
-async function $o(e, r, t) {
-  const a = await U("arcgis_knowledge_lucene_generation_prompt"), o = {
+async function Eo(e, t, r) {
+  const a = await B("arcgis_knowledge_lucene_generation_prompt"), o = {
     inquiry: e,
-    dataModelForSearch: Ro(r)
+    dataModelForSearch: Co(t)
   }, n = s.enum(["entity", "relationship", "both"]).describe("The graph element category to search against - entity, relationship, or both"), l = s.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."
   ), i = s.array(
     s.enum(
-      r.dataModel.entityTypes.map((d) => d.name).concat(r.dataModel.relationshipTypes.map((d) => d.name))
+      t.dataModel.entityTypes.map((d) => d.name).concat(t.dataModel.relationshipTypes.map((d) => d.name))
     )
   ).min(1), c = s.object({
     query: s.string().describe("A lucene syntax query string to be executed against the knowledge graph search API"),
@@ -3010,27 +3019,27 @@ async function $o(e, r, t) {
     promptText: a,
     inputVariables: o,
     schema: c,
-    config: t
+    config: r
   });
 }
-const ie = "searchGraphData", Co = s.object({
+const ie = "searchGraphData", Fo = s.object({
   prompt: s.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."
   )
-}), Eo = async ({ prompt: e }, r) => {
-  const { knowledgeGraph: t } = await M(r);
-  await S({ text: "Generating search query for the user inquiry" }, r);
-  const a = await $o(e, t, r);
-  await S({ text: "Executing graph search with generated search query" }, r);
-  const o = await io({
-    kg: t,
+}), ko = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t);
+  await x({ text: "Generating search query for the user inquiry" }, t);
+  const a = await Eo(e, r, t);
+  await x({ text: "Executing graph search with generated search query" }, t);
+  const o = await lo({
+    kg: r,
     searchQuery: a.query,
     typeCategoryFilter: a.typeCategoryFilter,
     namedTypesFilter: a.typeFilters,
     searchResultLimit: a.resultLimit,
     requestOptions: {
-      signal: Y(r),
-      timeout: r?.timeout
+      signal: Y(t),
+      timeout: t?.timeout
     }
   });
   if (o.type !== "success")
@@ -3066,7 +3075,7 @@ const ie = "searchGraphData", Co = s.object({
       searchResults: o.results
     }
   };
-}, li = w(Eo, {
+}, ui = g(ko, {
   name: ie,
   description: `
     Search the knowledge graph using one or more search texts, 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.
@@ -3078,53 +3087,53 @@ const ie = "searchGraphData", Co = s.object({
  - "Find all reports authored by someone with the title of 'Researcher'"
  - "Find the first 5 reports where summary mentions flood zoning near Sacramento, and the organization name is the City of Sacramento Utilities, and tags containing stormwater".
  - "Search for all john smiths and show their global ids`,
-  schema: Co
+  schema: Fo
 });
 export {
-  jn as A,
-  Ln as B,
-  Gn as C,
-  On as D,
-  Mn as E,
-  Qn as F,
+  Gn as A,
+  On as B,
+  Mn as C,
+  Qn as D,
+  _n as E,
+  Wn as F,
   ue as G,
-  Yn as H,
-  _n as I,
-  Wn as J,
-  Vn as K,
-  Un as L,
-  Bn as M,
-  $n as N,
-  Hn as O,
-  Jn as P,
-  Qa as Q,
+  ei as H,
+  Vn as I,
+  Bn as J,
+  Un as K,
+  Kn as L,
+  Hn as M,
+  En as N,
+  Zn as O,
+  Yn as P,
+  Wa as Q,
   N as R,
-  Kn as S,
-  Zn as T,
-  ai as a,
-  si as b,
-  oi as c,
-  ni as d,
-  ri as e,
+  Jn as S,
+  Xn as T,
+  ni as a,
+  ci as b,
+  ii as c,
+  si as d,
+  oi as e,
   xe as f,
-  U as g,
-  ti as h,
+  B as g,
+  ai as h,
   M as i,
-  ei as j,
-  Cn as k,
-  Xn as l,
-  En as m,
-  Fn as n,
-  kn as o,
-  Nn as p,
-  ii as q,
-  Pn as r,
-  li as s,
-  Ut as t,
-  qn as u,
-  In as v,
-  zn as w,
-  Dn as x,
+  ri as j,
+  Fn as k,
+  ti as l,
+  kn as m,
+  Nn as n,
+  qn as o,
+  In as p,
+  li as q,
+  Ln as r,
+  ui as s,
+  Bt as t,
+  zn as u,
+  Dn as v,
+  Pn as w,
+  An as x,
   C as y,
-  An as z
+  jn as z
 };