@arcgis/ai-components 5.2.0-next.23 → 5.2.0-next.25

package/dist/chunks/adapter.js

@@ -1,91 +1,91 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import me from "@arcgis/core/identity/IdentityManager.js";
+import pe from "@arcgis/core/identity/IdentityManager.js";
 import k from "@arcgis/core/portal/Portal.js";
-import { Annotation as b, messagesStateReducer as Te } from "@langchain/langgraph/web";
+import { Annotation as T, messagesStateReducer as be } from "@langchain/langgraph/web";
 import "@arcgis/toolkit/string";
-import { k as qe, j as B, i as De } from "./generateLayerDescriptions.js";
+import { k as De, j as H, i as Pe } from "./generateLayerDescriptions.js";
 import "@langchain/core/messages";
 import "@langchain/core/callbacks/dispatch/web";
 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 f } from "@langchain/core/tools";
-import Pe from "@arcgis/core/Graphic.js";
-import { addressToLocations as Le } from "@arcgis/core/rest/locator.js";
-import je from "@arcgis/core/symbols/PictureMarkerSymbol.js";
-import i, { z as E } from "zod";
-import Ge from "@arcgis/core/geometry/Extent.js";
-import ve from "@arcgis/core/geometry/Point.js";
-import { createRenderer as Oe } from "@arcgis/core/smartMapping/renderers/pieChart.js";
-import { getSchemesByTag as Me, getSchemes as Qe } from "@arcgis/core/smartMapping/symbology/pieChart.js";
-import { getBackgroundColorTheme as ye } from "@arcgis/core/views/support/colorUtils.js";
-import { a as x, s as S } from "./index.js";
-import { createAgeRenderer as _e, createContinuousRenderer as We } from "@arcgis/core/smartMapping/renderers/color.js";
-import { getSchemesByTag as le } from "@arcgis/core/smartMapping/symbology/color.js";
-import { createContinuousRenderer as Ve } from "@arcgis/core/smartMapping/renderers/univariateColorSize.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 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 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 Be } from "@arcgis/core/smartMapping/renderers/heatmap.js";
-import { getSchemesByTag as He } from "@arcgis/core/smartMapping/symbology/heatmap.js";
-import { createRenderer as Je } from "@arcgis/core/smartMapping/renderers/predominance.js";
-import { getSchemesByTag as Ze } from "@arcgis/core/smartMapping/symbology/predominance.js";
-import { createRenderer as Ye } from "@arcgis/core/smartMapping/renderers/relationship.js";
-import { getSchemesByTag as Xe } from "@arcgis/core/smartMapping/symbology/relationship.js";
-import { createAgeRenderer as et, createContinuousRenderer as tt } from "@arcgis/core/smartMapping/renderers/size.js";
-import { createRenderer as rt } from "@arcgis/core/smartMapping/renderers/type.js";
-import { getSchemesByTag as at } from "@arcgis/core/smartMapping/symbology/type.js";
-import { ToolNode as ot } from "@langchain/langgraph/prebuilt";
-import nt from "@arcgis/core/layers/support/FeatureEffect.js";
+import { createRenderer as He } from "@arcgis/core/smartMapping/renderers/heatmap.js";
+import { getSchemesByTag as Je } from "@arcgis/core/smartMapping/symbology/heatmap.js";
+import { createRenderer as Ze } from "@arcgis/core/smartMapping/renderers/predominance.js";
+import { getSchemesByTag as Ye } from "@arcgis/core/smartMapping/symbology/predominance.js";
+import { createRenderer as Xe } from "@arcgis/core/smartMapping/renderers/relationship.js";
+import { getSchemesByTag as et } from "@arcgis/core/smartMapping/symbology/relationship.js";
+import { createAgeRenderer as tt, createContinuousRenderer as rt } from "@arcgis/core/smartMapping/renderers/size.js";
+import { createRenderer as at } from "@arcgis/core/smartMapping/renderers/type.js";
+import { getSchemesByTag as ot } from "@arcgis/core/smartMapping/symbology/type.js";
+import { ToolNode as nt } from "@langchain/langgraph/prebuilt";
+import it from "@arcgis/core/layers/support/FeatureEffect.js";
 import Se from "@arcgis/core/layers/support/FeatureFilter.js";
-import * as it from "@arcgis/core/geometry/operators/unionOperator.js";
-import { formatDateOnly as st, convertDateFormatToIntlOptions as Q, formatTimeOnly as lt, formatDate as fe } from "@arcgis/core/intl.js";
-import ct from "@arcgis/core/smartMapping/statistics/summaryStatistics.js";
-import ut from "@arcgis/core/smartMapping/statistics/uniqueValues.js";
-import dt from "@arcgis/core/rest/support/TopFeaturesQuery.js";
-import pt from "@arcgis/core/rest/support/TopFilter.js";
-import mt from "@arcgis/core/WebLinkChart.js";
-import xe from "@arcgis/core/rest/knowledgeGraph/GraphQueryStreaming.js";
+import * as st from "@arcgis/core/geometry/operators/unionOperator.js";
+import { formatDateOnly as lt, convertDateFormatToIntlOptions as _, formatTimeOnly as ct, formatDate as ye } from "@arcgis/core/intl.js";
+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 mt from "@arcgis/core/rest/support/TopFilter.js";
+import ht from "@arcgis/core/WebLinkChart.js";
+import ve from "@arcgis/core/rest/knowledgeGraph/GraphQueryStreaming.js";
 import "@arcgis/core/views/LinkChartView.js";
-import { fetchKnowledgeGraph as ge, executeQueryStreaming as ht, executeSearchStreaming as yt } from "@arcgis/core/rest/knowledgeGraphService.js";
-import ft from "@arcgis/core/rest/knowledgeGraph/GraphSearchStreaming.js";
-const L = (e, t) => t ?? e, Rn = b.Root({
-  ...qe(),
+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 L = (e, t) => t ?? e, En = T.Root({
+  ...De(),
   // internal to the navigation agent
-  intent: b({
+  intent: T({
     reducer: L
   }),
-  vectorSearchLayerResults: b({
+  vectorSearchLayerResults: T({
     reducer: L,
     default: () => []
   }),
-  vectorSearchFieldResults: b({
+  vectorSearchFieldResults: T({
     reducer: L
   }),
-  navigationInternalState: b({
+  navigationInternalState: T({
     reducer: L,
     default: () => ({
       toolCallMessage: void 0
     })
   })
 });
-async function gt(e, t) {
+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];
   if (!c?.extent || !c.location)
     throw new Error(`Could not find location for: ${e}`);
-  const u = new je({
+  const u = new Ge({
     url: l,
     width: 24,
     height: 24
-  }), d = new Pe({
+  }), d = new Le({
     geometry: c.location,
     symbol: u
   });
@@ -100,26 +100,26 @@ async function gt(e, t) {
     sharedStatePatch: { lastResolvedLocation: { value: p } }
   };
 }
-const wt = ["mapView"];
-function $(e) {
+const bt = ["mapView"];
+function C(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("NavigationAgent context missing");
-  const a = wt.filter((o) => !(o in r));
+  const a = bt.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`NavigationAgent context missing: ${a.join(", ")}`);
   return r;
 }
-async function bt({ address: e }, t) {
-  const { mapView: r } = $(t);
-  return await gt(e, r);
+async function Tt({ address: e }, t) {
+  const { mapView: r } = C(t);
+  return await wt(e, r);
 }
-const Tt = i.object({
-  address: i.string().describe("The full address or place name to locate.")
-}), $n = f(bt, {
+const St = s.object({
+  address: s.string().describe("The full address or place name to locate.")
+}), Fn = g(Tt, {
   name: "goToAddress",
   description: "Geocodes an address using Esri's World Geocoding Service and zooms the map to that location.",
-  schema: Tt
+  schema: St
 });
 async function vt(e, t) {
   const a = t.map.bookmarks;
@@ -133,26 +133,26 @@ async function vt(e, t) {
     throw new Error(`Bookmark with name "${e}" does not have a valid viewpoint.`);
   return await t.goTo(n), { text: `Navigated to bookmark: ${e}` };
 }
-async function St({ bookmarkName: e }, t) {
-  const { mapView: r } = $(t);
+async function xt({ bookmarkName: e }, t) {
+  const { mapView: r } = C(t);
   return await Promise.resolve(vt(e, r));
 }
-const xt = E.object({
+const Rt = E.object({
   bookmarkName: E.string().describe("The name of the bookmark to navigate to.")
-}), Cn = f(St, {
+}), kn = g(xt, {
   name: "goToBookmark",
   description: "Go to the extent of the bookmark with the given name.",
-  schema: xt
+  schema: Rt
 });
-async function Rt(e, t, r) {
+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 = t?.trim() ? t : "1=1", n = a.createQuery();
   n.where = o;
   try {
-    const { extent: l, count: s } = await a.queryExtent(n);
-    if (s === 0)
+    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 r.goTo(l);
@@ -162,10 +162,10 @@ async function Rt(e, t, r) {
       layerId: e,
       layerTitle: a.title ?? e,
       where: o,
-      count: s
+      count: i
     };
     return {
-      text: `Successfully zoomed to ${s} feature(s) in ${a.title} matching: ${o}`,
+      text: `Successfully zoomed to ${i} feature(s) in ${a.title} matching: ${o}`,
       where: o,
       sharedStatePatch: { lastNavigatedFeatures: { value: c } }
     };
@@ -173,20 +173,20 @@ async function Rt(e, t, r) {
     return console.error("Error in goToFeatures:", l), { text: `Error: ${l instanceof Error ? l.message : "Unknown error"}`, where: o };
   }
 }
-async function $t({ layerId: e, where: t }, r) {
-  const { mapView: a } = $(r);
-  return await Rt(e, t, a);
+async function Ct({ layerId: e, where: t }, r) {
+  const { mapView: a } = C(r);
+  return await $t(e, t, a);
 }
-const Ct = E.object({
+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")
-}), En = f($t, {
+}), Nn = g(Ct, {
   name: "goToFeatures",
   description: "Go to the features that match the given filter related to the given layerId.",
-  schema: Ct
+  schema: Et
 });
-async function Et(e) {
-  const r = new Ge({
+async function Ft(e) {
+  const r = new Oe({
     xmin: -180,
     ymin: -90,
     xmax: 180,
@@ -195,16 +195,16 @@ async function Et(e) {
   }).expand(0.7);
   return await e.goTo(r), { text: "Successfully zoomed to world extent" };
 }
-async function Nt(e, t) {
-  const { mapView: r } = $(t);
-  return await Et(r);
+async function kt(e, t) {
+  const { mapView: r } = C(t);
+  return await Ft(r);
 }
-const It = E.object({}), Nn = f(Nt, {
+const Nt = E.object({}), qn = g(kt, {
   name: "goToFullExtent",
   description: "Zooms the map to the full world extent using Esri's Geocoding Service.",
-  schema: It
+  schema: Nt
 });
-async function kt(e) {
+async function qt(e) {
   const r = e.map.initialViewProperties?.viewpoint?.targetGeometry;
   if (r)
     await e.goTo(r);
@@ -212,16 +212,16 @@ async function kt(e) {
     throw new Error("Initial extent is undefined");
   return { text: "Successfully zoomed to home extent" };
 }
-async function Ft(e, t) {
-  const { mapView: r } = $(t);
-  return await kt(r);
+async function It(e, t) {
+  const { mapView: r } = C(t);
+  return await qt(r);
 }
-const zt = i.object({}), In = f(Ft, {
+const zt = s.object({}), In = g(It, {
   name: "goToHomeExtent",
   description: "Go to the initial web map view extent",
   schema: zt
 });
-async function qt(e, t) {
+async function Dt(e, t) {
   await t.when();
   const r = t.map?.allLayers.find((o) => o.id === e);
   if (!r)
@@ -229,34 +229,34 @@ async function qt(e, t) {
   let a;
   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 Dt({ layerId: e }, t) {
-  const { mapView: r } = $(t);
-  return await qt(e, r);
+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")
-}), kn = f(Dt, {
+}), zn = g(Pt, {
   name: "goToLayer",
   description: "Zooms the map view to the full extent of the top matching layer.",
   schema: At
 });
-async function Pt(e, t) {
+async function Lt(e, t) {
   return await t.goTo({ scale: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function Lt({ scale: e }, t) {
-  const { mapView: r } = $(t);
-  return await Pt(e, r);
+async function jt({ scale: e }, t) {
+  const { mapView: r } = C(t);
+  return await Lt(e, r);
 }
-const jt = i.object({
-  scale: i.number().describe("The map scale of the view to go to.")
-}), Fn = f(Lt, {
+const Gt = s.object({
+  scale: s.number().describe("The map scale of the view to go to.")
+}), Dn = g(jt, {
   name: "goToScale",
   description: "Go to the specified view scale.",
-  schema: jt
+  schema: Gt
 });
-async function Gt(e, t, r) {
+async function Ot(e, t, r) {
   const o = {
-    target: new ve({
+    target: new Te({
       longitude: e.longitude,
       latitude: e.latitude,
       spatialReference: { wkid: 4326 }
@@ -268,42 +268,43 @@ async function Gt(e, t, r) {
     r?.scale !== void 0 ? `scale 1:${r.scale}` : ""
   ].filter(Boolean).join(", ")}` };
 }
-async function Ot({
+async function Mt({
   center: e,
   zoom: t,
   scale: r
 }, a) {
-  const { mapView: o } = $(a);
-  return await Gt(e, o, { zoom: t, scale: r });
+  const { mapView: o } = C(a);
+  return await Ot(e, o, { zoom: t, scale: r });
 }
-const Mt = i.object({
-  center: i.object({
-    longitude: i.number().describe("The longitude (x-coordinate) of the point to navigate to."),
-    latitude: i.number().describe("The latitude (y-coordinate) of the point to navigate to.")
+const Qt = s.object({
+  center: s.object({
+    longitude: s.number().describe("The longitude (x-coordinate) of the point to navigate to."),
+    latitude: s.number().describe("The latitude (y-coordinate) of the point to navigate to.")
   }),
-  zoom: i.number().optional().describe("The zoom level. Higher values = more zoomed in."),
-  scale: i.number().optional().describe("The map scale. Alternative to zoom. Smaller numbers = more zoomed in.")
-}), zn = f(Ot, {
+  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.")
+}), Pn = g(Mt, {
   name: "goToViewpoint",
   description: "Go to the specified viewpoint. This can contain a combination of scale, center, zoom, etc.",
-  schema: Mt
+  schema: Qt
 });
-async function Qt(e, t) {
+async function _t(e, t) {
   return await t.goTo({ zoom: e }), { text: `Successfully zoomed to: ${e}` };
 }
-async function _t({ zoom: e }, t) {
-  const { mapView: r } = $(t);
-  return await Qt(e, r);
+async function Wt({ zoom: e }, t) {
+  const { mapView: r } = C(t);
+  return await _t(e, r);
 }
-const Wt = i.object({
-  zoom: i.number().min(1).max(20).describe("The zoom level of the view to go to.")
-}), qn = f(_t, {
+const Vt = s.object({
+  zoom: s.number().min(1).max(20).describe("The zoom level of the view to go to.")
+}), 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: Wt
-}), we = /* @__PURE__ */ Object.assign({
+  schema: Vt
+}), ge = /* @__PURE__ */ Object.assign({
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_current_lc_context.md": () => import("./arcgis_knowledge_current_lc_context.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_current_map_context.md": () => import("./arcgis_knowledge_current_map_context.js").then((e) => e.default),
+  "../agents/arcgisKnowledge/prompts/arcgis_knowledge_cypher_query_prompt.md": () => import("./arcgis_knowledge_cypher_query_prompt.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_lucene_generation_prompt.md": () => import("./arcgis_knowledge_lucene_generation_prompt.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_summarize_result_prompt.md": () => import("./arcgis_knowledge_summarize_result_prompt.js").then((e) => e.default),
   "../agents/arcgisKnowledge/prompts/arcgis_knowledge_tool_prompt.md": () => import("./arcgis_knowledge_tool_prompt.js").then((e) => e.default),
@@ -315,24 +316,24 @@ const Wt = i.object({
   "../agents/navigation/prompts/navigation_intent_prompt.md": () => import("./navigation_intent_prompt.js").then((e) => e.default),
   "../agents/navigation/prompts/navigation_tool_prompt.md": () => import("./navigation_tool_prompt.js").then((e) => e.default)
 });
-async function te(e) {
-  const t = Object.entries(we).find(([r]) => r.endsWith(`/${e}.md`));
+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(we).join(`
+${Object.keys(ge).join(`
 `)}`);
   return await t[1]();
 }
-const Vt = (e, t = 300) => {
+const Bt = (e, t = 300) => {
   const r = e.replace(/\s+/gu, " ").replace(/[*_`#>\-]/gu, "").trim();
   return r.length > t ? `${r.slice(0, t)}...` : r;
-}, Re = (e, t) => {
+}, xe = (e, t) => {
   const a = e?.configurable?.services?.[t];
   if (a == null)
     throw new Error(`${t} missing in config.configurable.services`);
   return a;
-}, Dn = (e, t) => (r, a) => {
+}, Ln = (e, t) => (r, a) => {
   const o = a?.configurable?.services;
   for (const n of e)
     if (!o?.[n])
@@ -342,21 +343,21 @@ const Vt = (e, t = 300) => {
 async function Ut(e) {
   const { fields: t, layer: r, view: a, styleName: o, colorSchemeTags: n } = e;
   let l;
-  return n ? l = Me({
-    basemapTheme: await ye(a),
+  return n ? l = Qe({
+    basemapTheme: await he(a),
     geometryType: r.geometryType,
     includedTags: n,
     numColors: Math.min(t.length, 8)
-  })[0] : l = Qe({
-    basemapTheme: await ye(a),
+  })[0] : l = _e({
+    basemapTheme: await he(a),
     geometryType: r.geometryType,
     numColors: Math.min(t.length, 8)
   }).primaryScheme, {
     layer: r,
     view: a,
-    attributes: t.map((s) => ({
-      field: s,
-      label: r.fields.find((c) => c.name === s)?.alias ?? ""
+    attributes: t.map((i) => ({
+      field: i,
+      label: r.fields.find((c) => c.name === i)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
@@ -365,9 +366,9 @@ async function Ut(e) {
   };
 }
 async function Kt(e) {
-  return await Oe(e);
+  return await Me(e);
 }
-async function Bt({
+async function Ht({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -375,41 +376,41 @@ async function Bt({
   colorSchemes: o,
   includeSize: n
 }) {
-  const l = t, s = e?.allLayers.find((d) => d.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((d) => d.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const u = {
     styleName: n ? "chart-size" : "chart",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o
   };
   try {
     const d = await Ut(u), p = await Kt(d);
-    return s.renderer = p.renderer, s.visible = !0, `Chart renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    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 Ht = ["mapView"];
-function R(e) {
+const Jt = ["mapView"];
+function $(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("LayerStylingAgent context missing");
-  const a = Ht.filter((o) => !(o in r));
+  const a = Jt.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`LayerStylingAgent context missing: ${a.join(", ")}`);
   return r;
 }
-async function Jt({
+async function Zt({
   layerId: e,
   fields: t,
   colorSchemes: r,
   includeSize: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Bt({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Ht({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -418,12 +419,12 @@ async function Jt({
     includeSize: a
   });
 }
-const Zt = i.object({
-  layerId: i.string().describe("The id of the layer to apply the chart renderer to"),
-  fields: i.array(i.string()).describe("The fields to use for the chart renderer (multiple numeric fields)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  includeSize: i.boolean().optional().describe("Whether to vary the chart size (chart-size)")
-}), An = f(Jt, {
+const Yt = s.object({
+  layerId: s.string().describe("The id of the layer to apply the chart renderer to"),
+  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)")
+}), 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.
@@ -436,12 +437,12 @@ const Zt = i.object({
     Keywords: pie, chart, all categories, breakdown, proportion, total, amount, how much, sum, graduated size, proportional size
     Example: Show the total number of homes built in each decade using a pie chart for each feature and vary the size of each chart based on the total of all categories.
     Fields: This style requires 2-8 number fields.`,
-  schema: Zt
+  schema: Yt
 });
-function Yt(e) {
+function Xt(e) {
   const { fields: t, layer: r, view: a, theme: o, colorSchemeTags: n } = e, l = t[0];
-  let s;
-  return n && (s = le({
+  let i;
+  return n && (i = se({
     geometryType: r.geometryType,
     includedTags: n,
     theme: o || "high-to-low"
@@ -453,13 +454,13 @@ function Yt(e) {
     theme: o,
     sizeOptimizationEnabled: !0,
     outlineOptimizationEnabled: !0,
-    colorScheme: s
+    colorScheme: i
   };
 }
-async function Xt(e) {
-  return await _e(e);
+async function er(e) {
+  return await We(e);
 }
-async function er({
+async function tr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -467,32 +468,32 @@ async function er({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color-age",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = Yt(c), d = await Xt(u);
-    return s.renderer = d.renderer, s.visible = !0, `Color-age renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = Xt(c), d = await er(u);
+    return i.renderer = d.renderer, i.visible = !0, `Color-age renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying color-age renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function tr({
+async function rr({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await er({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await tr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -501,33 +502,33 @@ async function tr({
     theme: a
   });
 }
-const rr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the color-age renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the color-age renderer (temporal/date data)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), Pn = f(tr, {
+const ar = s.object({
+  layerId: s.string().describe("The id of the layer to apply the color-age renderer to"),
+  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")
+}), 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.
     Keywords: since, age, how old, how long
     Example: Show the age of each feature based on its reported date.
     Fields: This style requires at least one field with a date type.`,
-  schema: rr
+  schema: ar
 });
-function ar(e) {
+function or(e) {
   const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let { theme: n } = e, l = t[1];
-  const s = t[0];
+  const i = t[0];
   let c;
-  return o && (c = le({
+  return o && (c = se({
     geometryType: r.geometryType,
     includedTags: o,
     theme: n || "high-to-low"
   })[0]), {
     layer: r,
     view: a,
-    field: s,
+    field: i,
     normalizationField: l,
     theme: n,
     sizeOptimizationEnabled: !0,
@@ -535,10 +536,10 @@ function ar(e) {
     colorScheme: c
   };
 }
-async function or(e) {
-  return await We(e);
+async function nr(e) {
+  return await Ve(e);
 }
-async function nr({
+async function ir({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -546,32 +547,32 @@ async function nr({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = ar(c), d = await or(u);
-    return s.renderer = d.renderer, s.visible = !0, `Color renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = or(c), d = await nr(u);
+    return i.renderer = d.renderer, i.visible = !0, `Color renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying color renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function ir({
+async function sr({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await nr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await ir({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -580,25 +581,25 @@ async function ir({
     theme: a
   });
 }
-const sr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the color renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the color renderer"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color ramp")
-}), Ln = f(ir, {
+const lr = s.object({
+  layerId: s.string().describe("The id of the layer to apply the color renderer to"),
+  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")
+}), 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.
     Keywords: graduated color, choropleth, continuous color, hue, color, gradation, saturation, lightness, percent, rate, ratio, index, how much, increase, decrease
     Example: Color each feature based on the population density.
     Fields: This style requires a single field with a number type. A second number field may be specified for normalizing the value of the first field.`,
-  schema: sr
+  schema: lr
 });
-function lr(e) {
+function cr(e) {
   const { fields: t, layer: r, view: a, colorSchemeTags: o, theme: n } = e;
-  let l, s;
+  let l, i;
   const c = t[0];
-  return o && (s = le({
+  return o && (i = se({
     geometryType: r.geometryType,
     includedTags: o,
     theme: n || "high-to-low"
@@ -609,14 +610,14 @@ function lr(e) {
     normalizationField: l,
     theme: n,
     colorOptions: {
-      colorScheme: s
+      colorScheme: i
     }
   };
 }
-async function cr(e) {
-  return await Ve(e);
+async function ur(e) {
+  return await Be(e);
 }
-async function ur({
+async function dr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -624,32 +625,32 @@ async function ur({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "color-size-univariate",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = lr(c), d = await cr(u);
-    return s.renderer = d.renderer, s.visible = !0, `Color-size-univariate renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = cr(c), d = await ur(u);
+    return i.renderer = d.renderer, i.visible = !0, `Color-size-univariate renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying color-size-univariate renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function dr({
+async function pr({
   layerId: e,
   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 dr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -658,21 +659,21 @@ async function dr({
     theme: a
   });
 }
-const pr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the color-size univariate renderer to"),
-  fields: i.array(i.string()).describe("The fields to use for the color-size univariate renderer"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color and size ramps")
-}), jn = f(dr, {
+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")
+}), 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: pr
+  schema: mr
 });
-function mr(e) {
+function hr(e) {
   const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
   return o && (n = Ke({
@@ -686,16 +687,16 @@ function mr(e) {
     },
     attributes: t.map((l) => ({
       field: l,
-      label: r.fields.find((s) => s.name === l)?.alias ?? ""
+      label: r.fields.find((i) => i.name === l)?.alias ?? ""
     })).slice(0, 8),
     outlineOptimizationEnabled: !0,
     dotDensityScheme: n
   };
 }
-async function hr(e) {
+async function yr(e) {
   return await Ue(e);
 }
-async function yr({
+async function fr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -705,7 +706,7 @@ async function yr({
   const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
     return `Could not find layer for id: ${r}`;
-  const s = {
+  const i = {
     styleName: "dot-density",
     fields: a,
     layer: l,
@@ -713,19 +714,19 @@ async function yr({
     colorSchemeTags: o
   };
   try {
-    const c = mr(s), u = await hr(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)}`;
   }
 }
-async function fr({
+async function gr({
   layerId: e,
   fields: t,
   colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await yr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await fr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
@@ -733,11 +734,11 @@ async function fr({
     colorSchemes: r
   });
 }
-const gr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the dot density renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the dot density renderer (population or count data)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), Gn = f(fr, {
+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")
+}), 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.
@@ -751,13 +752,13 @@ const gr = i.object({
     - Display demographic patterns within census tracts
     **Fields:** Requires 2-8 number fields.
     **Keywords:** density, how much, how many, total, number, amount`,
-  schema: gr
+  schema: wr
 });
-function wr(e) {
+function br(e) {
   const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
   const l = t[0];
-  return o && (n = He({
+  return o && (n = Je({
     includedTags: o,
     basemap: a.map?.basemap || "topo"
   })[0]), {
@@ -767,10 +768,10 @@ function wr(e) {
     heatmapScheme: n
   };
 }
-async function br(e) {
-  return await Be(e);
+async function Tr(e) {
+  return await He(e);
 }
-async function Tr({
+async function Sr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -780,7 +781,7 @@ async function Tr({
   const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
     return `Could not find layer for id: ${r}`;
-  const s = {
+  const i = {
     styleName: "heatmap",
     fields: a,
     layer: l,
@@ -788,7 +789,7 @@ async function Tr({
     colorSchemeTags: o
   };
   try {
-    const c = wr(s), u = await br(c);
+    const c = br(i), u = await Tr(c);
     return l.renderer = u.renderer, l.visible = !0, `Heatmap renderer applied to layer: ${l.title ?? l.id} using fields ${a.join(", ")}`;
   } catch (c) {
     return `Error applying heatmap renderer: ${c instanceof Error ? c.message : String(c)}`;
@@ -799,8 +800,8 @@ async function vr({
   fields: t,
   colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await Tr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await Sr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
@@ -808,40 +809,40 @@ async function vr({
     colorSchemes: r
   });
 }
-const Sr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the heatmap renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the heatmap renderer (typically point density)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), On = f(vr, {
+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")
+}), _n = g(vr, {
   name: "heatmap",
   description: `Label: Heat Map
 Description: Show areas of high density with colors that appear to glow hotter. This is only valid for point layers.
 Keywords: density, heatmap, hot spots, pattern, cluster
 Example: Create a heatmap
 Fields: This typically requires zero or one field of type number.`,
-  schema: Sr
+  schema: xr
 });
-function xr(e) {
+function Rr(e) {
   const { fields: t, layer: r, view: a, styleName: o, colorSchemeTags: n } = e;
   let l;
-  return n && (l = Ze({
+  return n && (l = Ye({
     geometryType: r.geometryType,
     includedTags: n,
     numColors: Math.min(t.length, 10)
   })[0]), {
     layer: r,
     view: a,
-    fields: t.map((s) => ({ name: s })).slice(0, 9),
+    fields: t.map((i) => ({ name: i })).slice(0, 9),
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     includeSizeVariable: o.includes("Size"),
     predominanceScheme: l
   };
 }
-async function Rr(e) {
-  return await Je(e);
+async function $r(e) {
+  return await Ze(e);
 }
-async function $r({
+async function Cr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -849,31 +850,31 @@ async function $r({
   colorSchemes: o,
   includeSize: n
 }) {
-  const l = t, s = e?.allLayers.find((d) => d.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((d) => d.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const u = {
     styleName: n ? "predominance-size" : "predominance",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o
   };
   try {
-    const d = xr(u), p = await Rr(d);
-    return s.renderer = p.renderer, s.visible = !0, `Predominance renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const d = Rr(u), p = await $r(d);
+    return i.renderer = p.renderer, i.visible = !0, `Predominance renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (d) {
     return `Error applying predominance renderer: ${d instanceof Error ? d.message : String(d)}`;
   }
 }
-async function Cr({
+async function Er({
   layerId: e,
   fields: t,
   colorSchemes: r,
   includeSize: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await $r({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Cr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -882,12 +883,12 @@ async function Cr({
     includeSize: a
   });
 }
-const Er = i.object({
-  layerId: i.string().describe("The id of the layer to apply the predominance renderer to"),
-  fields: i.array(i.string()).describe("The fields to use for the predominance renderer (competing categories)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  includeSize: i.boolean().optional().describe("Whether to include size visualization (predominance-size)")
-}), Mn = f(Cr, {
+const Fr = s.object({
+  layerId: s.string().describe("The id of the layer to apply the predominance renderer to"),
+  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)")
+}), 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.
@@ -900,33 +901,33 @@ const Er = i.object({
     Keywords: predominant, winner, won, competing, most, most common, most frequent, dominant, prevalent, top, amount, total, how much, proportional size, graduated size, sum
     Example: Show the predominant crop in each area and vary the size of each symbol based on the total of all categories.
     Fields: This style relies on 2-10 number fields.`,
-  schema: Er
+  schema: Fr
 });
-function Nr(e) {
+function kr(e) {
   const { fields: t, layer: r, view: a, colorSchemeTags: o } = e;
   let n;
   const l = {
     field: t[0]
-  }, s = {
+  }, i = {
     field: t[1]
   };
-  return o && (n = Xe({
+  return o && (n = et({
     geometryType: r.geometryType,
     includedTags: o
   })[0]), {
     layer: r,
     view: a,
     field1: l,
-    field2: s,
+    field2: i,
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     relationshipScheme: n
   };
 }
-async function Ir(e) {
-  return await Ye(e);
+async function Nr(e) {
+  return await Xe(e);
 }
-async function kr({
+async function qr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -936,7 +937,7 @@ async function kr({
   const n = t, l = e?.allLayers.find((c) => c.id === r);
   if (!l)
     return `Could not find layer for id: ${r}`;
-  const s = {
+  const i = {
     styleName: "relationship",
     fields: a,
     layer: l,
@@ -944,19 +945,19 @@ async function kr({
     colorSchemeTags: o
   };
   try {
-    const c = Nr(s), u = await Ir(c);
+    const c = kr(i), u = await Nr(c);
     return l.renderer = u.renderer, l.visible = !0, `Relationship renderer applied to layer: ${l.title ?? l.id} using fields ${a.join(", ")}`;
   } catch (c) {
     return `Error applying relationship renderer: ${c instanceof Error ? c.message : String(c)}`;
   }
 }
-async function Fr({
+async function Ir({
   layerId: e,
   fields: t,
   colorSchemes: r
 }, a) {
-  const { mapView: o } = R(a);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, a), await kr({
+  const { mapView: o } = $(a);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, a), await qr({
     arcgisMap: o.map,
     arcgisMapView: o,
     layerId: e,
@@ -964,11 +965,11 @@ async function Fr({
     colorSchemes: r
   });
 }
-const zr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the relationship renderer to"),
-  fields: i.array(i.string()).describe("The two fields to use for the relationship renderer (bivariate visualization)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use")
-}), Qn = f(Fr, {
+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")
+}), Vn = g(Ir, {
   name: "relationship",
   description: `Label: Relationship
     Description: Overlays two color ramps to represent the relationship between two numeric attributes.
@@ -977,7 +978,7 @@ const zr = i.object({
     Fields: This style requires two number fields.`,
   schema: zr
 });
-function qr(e) {
+function Dr(e) {
   const { fields: t, layer: r, view: a, theme: o } = e, n = t[0];
   return {
     layer: r,
@@ -989,8 +990,8 @@ function qr(e) {
     outlineOptimizationEnabled: !0
   };
 }
-async function Dr(e) {
-  return await et(e);
+async function Pr(e) {
+  return await tt(e);
 }
 async function Ar({
   arcgisMap: e,
@@ -1000,32 +1001,32 @@ async function Ar({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "size-age",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = qr(c), d = await Dr(u);
-    return s.renderer = d.renderer, s.visible = !0, `Size-age renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = Dr(c), d = await Pr(u);
+    return i.renderer = d.renderer, i.visible = !0, `Size-age renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying size-age renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Pr({
+async function Lr({
   layerId: e,
   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,
@@ -1034,21 +1035,21 @@ async function Pr({
     theme: a
   });
 }
-const Lr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the size-age renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the size-age renderer (temporal data with size)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), _n = f(Pr, {
+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")
+}), 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 jr(e) {
+function Gr(e) {
   const { fields: t, layer: r, view: a } = e;
   let { theme: o } = e, n = t[1];
   const l = t[0];
@@ -1062,10 +1063,10 @@ function jr(e) {
     outlineOptimizationEnabled: !0
   };
 }
-async function Gr(e) {
-  return await tt(e);
+async function Or(e) {
+  return await rt(e);
 }
-async function Or({
+async function Mr({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -1073,32 +1074,32 @@ async function Or({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "size",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = jr(c), d = await Gr(u);
-    return s.renderer = d.renderer, s.visible = !0, `Size renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = Gr(c), d = await Or(u);
+    return i.renderer = d.renderer, i.visible = !0, `Size renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying size renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
 }
-async function Mr({
+async function Qr({
   layerId: e,
   fields: t,
   colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Or({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Mr({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -1107,12 +1108,12 @@ async function Mr({
     theme: a
   });
 }
-const Qr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the size renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the size renderer (numeric data)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the size ramp")
-}), Wn = f(Mr, {
+const _r = s.object({
+  layerId: s.string().describe("The id of the layer to apply the size renderer to"),
+  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")
+}), 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.
@@ -1125,12 +1126,12 @@ const Qr = i.object({
     Keywords: graduated size, proportional size, classed size, how much, total, number, when
     Example: Vary the size of each feature based on the date a ticket was completed.
     Fields: This style requires a single field with a date type.`,
-  schema: Qr
+  schema: _r
 });
-function _r(e) {
-  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e, n = t[0], l = t[1], s = t[2];
+function Wr(e) {
+  const { fields: t, layer: r, view: a, colorSchemeTags: o } = e, n = t[0], l = t[1], i = t[2];
   let c;
-  return o && (c = at({
+  return o && (c = ot({
     geometryType: r.geometryType,
     includedTags: o
   })[0]), {
@@ -1138,16 +1139,16 @@ function _r(e) {
     view: a,
     field: n,
     field2: l,
-    field3: s,
+    field3: i,
     outlineOptimizationEnabled: !0,
     sizeOptimizationEnabled: !0,
     typeScheme: c
   };
 }
-async function Wr(e) {
-  return await rt(e);
+async function Vr(e) {
+  return await at(e);
 }
-async function Vr({
+async function Br({
   arcgisMap: e,
   arcgisMapView: t,
   layerId: r,
@@ -1155,20 +1156,20 @@ async function Vr({
   colorSchemes: o,
   theme: n
 }) {
-  const l = t, s = e?.allLayers.find((u) => u.id === r);
-  if (!s)
+  const l = t, i = e?.allLayers.find((u) => u.id === r);
+  if (!i)
     return `Could not find layer for id: ${r}`;
   const c = {
     styleName: "type",
     fields: a,
-    layer: s,
+    layer: i,
     view: l,
     colorSchemeTags: o,
     theme: n
   };
   try {
-    const u = _r(c), d = await Wr(u);
-    return s.renderer = d.renderer, s.visible = !0, `Type renderer applied to layer: ${s.title ?? s.id} using fields ${a.join(", ")}`;
+    const u = Wr(c), d = await Vr(u);
+    return i.renderer = d.renderer, i.visible = !0, `Type renderer applied to layer: ${i.title ?? i.id} using fields ${a.join(", ")}`;
   } catch (u) {
     return `Error applying type renderer: ${u instanceof Error ? u.message : String(u)}`;
   }
@@ -1179,8 +1180,8 @@ async function Ur({
   colorSchemes: r,
   theme: a
 }, o) {
-  const { mapView: n } = R(o);
-  return await x({ type: "show-legend", data: { layerIds: [e] } }, o), await Vr({
+  const { mapView: n } = $(o);
+  return await R({ type: "show-legend", data: { layerIds: [e] } }, o), await Br({
     arcgisMap: n.map,
     arcgisMapView: n,
     layerId: e,
@@ -1189,12 +1190,12 @@ async function Ur({
     theme: a
   });
 }
-const Kr = i.object({
-  layerId: i.string().describe("The id of the layer to apply the type renderer to"),
-  fields: i.array(i.string()).describe("The field(s) to use for the type renderer (categorical data)"),
-  colorSchemes: i.array(i.string()).optional().describe("Optional color scheme tags to use"),
-  theme: i.enum(["above-and-below", "above", "below", "centered-on", "extremes", "high-to-low"]).optional().describe("Optional theme for the color scheme")
-}), Vn = f(Ur, {
+const Kr = s.object({
+  layerId: s.string().describe("The id of the layer to apply the type renderer to"),
+  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")
+}), 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.
@@ -1202,71 +1203,71 @@ 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
-}), Un = b.Root({
-  ...B(),
-  vectorSearchLayerIds: b(),
-  vectorSearchFieldResults: b(),
-  layerFieldInfo: b(),
-  selectedLayerId: b()
-}), Kn = b.Root({
-  ...B(),
-  vectorSearchLayerIds: b(),
-  vectorSearchFieldResults: b(),
-  layerFieldInfo: b(),
-  queryResponse: b(),
-  dataExplorationMessages: b({
-    reducer: Te,
+}), Hn = T.Root({
+  ...H(),
+  vectorSearchLayerIds: T(),
+  vectorSearchFieldResults: T(),
+  layerFieldInfo: T(),
+  selectedLayerId: T()
+}), Jn = T.Root({
+  ...H(),
+  vectorSearchLayerIds: T(),
+  vectorSearchFieldResults: T(),
+  layerFieldInfo: T(),
+  queryResponse: T(),
+  dataExplorationMessages: T({
+    reducer: be,
     default: () => []
   })
-}), Br = ["mapView"];
-function F(e) {
+}), Hr = ["mapView"];
+function N(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("DataExplorationAgent context missing");
-  const a = Br.filter((o) => !(o in r));
+  const a = Hr.filter((o) => !(o in r));
   if (a.length)
     throw new Error(`DataExplorationAgent context missing: ${a.join(", ")}`);
   return r;
 }
-const Hr = (e) => {
+const Jr = (e) => {
   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, r++);
   }), r > 0 ? `Cleared filters from ${r} layer(s). View unchanged.` : "No active filters to clear. View unchanged.";
-}, Jr = async (e, t) => {
-  const { mapView: r } = F(t);
-  return Hr(r);
-}, Zr = f(Jr, {
+}, 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: i.object({})
-}), Yr = async (e) => {
+  schema: s.object({})
+}), Xr = async (e) => {
   e.map?.allLayers.filter((o) => o.type === "feature")?.forEach((o) => {
     const n = o;
     n.featureEffect && (n.featureEffect = null);
   });
   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.";
-}, Xr = async (e, t) => {
-  const { mapView: r } = F(t);
-  return await Yr(r);
-}, ea = f(Xr, {
+}, 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: i.object({})
-}), be = 750;
+  schema: s.object({})
+}), we = 750;
 function U(e) {
   return "point" in e && e.point !== void 0;
 }
 function j(e) {
   return "layerId" in e && e.layerId !== void 0;
 }
-const H = async (e, t) => {
+const J = async (e, t) => {
   if (U(e)) {
     const { point: r } = e;
-    return { geometry: new ve({
+    return { geometry: new Te({
       x: r.x,
       y: r.y,
       spatialReference: r.spatialReference ? { wkid: r.spatialReference.wkid } : t.spatialReference
@@ -1284,37 +1285,37 @@ const H = async (e, t) => {
         where: o,
         returnGeometry: !0,
         outSpatialReference: t.spatialReference,
-        num: be + 1
+        num: we + 1
       });
       if (!n.features.length)
         return {
           error: `No features found in geometry layer "${a}" with the specified where clause: ${o}`
         };
-      if (n.features.length > be)
+      if (n.features.length > we)
         return {
           error: `Geometry filter for layer "${a}" matched too many features (${n.features.length}+). Please narrow the geometry layer filter.`
         };
       const l = n.features.map((c) => c.geometry).filter((c) => !!c);
       if (!l.length)
         return { error: "No valid geometries found for the matched geometry layer features." };
-      const s = l.length === 1 ? l[0] : it.executeMany(l);
-      return s ? (s.spatialReference || (s.spatialReference = t.spatialReference), { geometry: s }) : { error: "Failed to combine geometries from geometry layer." };
+      const i = l.length === 1 ? l[0] : st.executeMany(l);
+      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" };
-}, ta = async (e, t, r, a, o, n) => {
+}, 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 '${t}' not found.` };
-  const s = l.createQuery();
-  s.where = r ?? "1=1", a && (s.geometry = a, s.spatialRelationship = "intersects", o && (s.distance = o), n && (s.units = n));
+  const i = l.createQuery();
+  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(s);
+    const { extent: c, count: u } = await l.queryExtent(i);
     return !c || u === 0 ? {
       success: !1,
-      error: `No features found for filter (where: ${s.where}${a ? ", spatial filter used" : ""})`
+      error: `No features found for filter (where: ${i.where}${a ? ", spatial filter used" : ""})`
     } : (await e.goTo(c), { success: !0 });
   } catch (c) {
     return {
@@ -1322,23 +1323,23 @@ const H = async (e, t) => {
       error: c instanceof Error ? c.message : String(c)
     };
   }
-}, ra = async (e, t, r, a, o, n) => {
+}, 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 s;
+  let i;
   if (o) {
-    const p = await H(o, t);
+    const p = await J(o, t);
     if ("error" in p)
       return p.error;
-    s = p.geometry;
+    i = p.geometry;
   }
-  if (l.featureEffect = null, l.featureEffect = new nt({
+  if (l.featureEffect = null, l.featureEffect = new it({
     filter: new Se({
       ...e.objectIds?.length ? { objectIds: e.objectIds } : { where: e.where },
-      geometry: s,
+      geometry: i,
       spatialRelationship: "intersects",
       distance: o?.distance,
       units: o?.units
@@ -1347,62 +1348,62 @@ const H = async (e, t) => {
     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 ta(
+  const c = e.objectIds?.length ? `${l.objectIdField} IN (${e.objectIds.join(",")})` : e.where, u = await ra(
     t,
     e.layerId,
     c,
-    s,
+    i,
     o?.distance,
     o?.units
   ), d = l.title ?? e.layerId;
   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}`;
-}, aa = ["feet", "kilometers", "meters", "miles", "nautical-miles", "us-nautical-miles"], I = i.enum(aa), oa = async ({
+}, oa = ["feet", "kilometers", "meters", "miles", "nautical-miles", "us-nautical-miles"], F = s.enum(oa), na = async ({
   targetLayer: e,
   geometryFilter: t,
   useCurrentExtent: r,
   includedEffect: a = "drop-shadow(2px, 2px, 2px, gray)",
   excludedEffect: o = "grayscale(100%) opacity(60%) blur(2px)"
 }, n) => {
-  const { mapView: l } = F(n);
-  return await ra(e, l, a, o, t, r);
-}, na = i.object({
-  layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
-  where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
-  distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), ia = i.object({
-  point: i.object({
-    x: i.number().describe("X coordinate (longitude) from navigation result"),
-    y: i.number().describe("Y coordinate (latitude) from navigation result"),
-    spatialReference: i.object({
-      wkid: i.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
+  const { mapView: l } = N(n);
+  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."),
+  distance: s.number().optional().describe("The buffer distance around the geometry."),
+  units: F.optional().describe("The units for the distance buffer.")
+}), sa = 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"),
+    spatialReference: s.object({
+      wkid: s.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
-  distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), sa = i.object({
-  targetLayer: i.object({
-    layerId: i.string().describe("The layerId of the layer on which to set a feature effect."),
-    where: i.string().describe("The SQL-92 where clause representing the features to emphasize."),
-    objectIds: i.array(i.number()).optional().describe(
+  distance: s.number().optional().describe("Optional buffer distance around the point."),
+  units: F.optional().describe("The units for the distance buffer.")
+}), la = s.object({
+  targetLayer: s.object({
+    layerId: s.string().describe("The layerId of the layer on which to set a feature effect."),
+    where: s.string().describe("The SQL-92 where clause representing the features to emphasize."),
+    objectIds: s.array(s.number()).optional().describe(
       "Array of objectIds from a previous query result. Use this instead of a where clause when the query returned objectIds (e.g. top N results). If provided, takes precedence over where clause."
     )
   }),
-  geometryFilter: i.union([na, ia]).optional().describe("Optional geometry-based filtering parameters for spatial queries."),
-  useCurrentExtent: i.boolean().optional().describe(
+  geometryFilter: s.union([ia, sa]).optional().describe("Optional geometry-based filtering parameters for spatial queries."),
+  useCurrentExtent: s.boolean().optional().describe(
     "Set to true when the previous query used the current map extent as a spatial filter. This ensures the feature effect applies only to features visible in the current view. Default is false."
   ),
-  includedEffect: i.string().default("drop-shadow(2px, 2px, 2px, gray)").describe(
+  includedEffect: s.string().default("drop-shadow(2px, 2px, 2px, gray)").describe(
     "The effect applied to features that 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."
   ),
-  excludedEffect: i.string().default("grayscale(100%) opacity(60%) blur(2px)").describe(
+  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."
   )
-}), la = f(oa, {
+}), 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: sa
-}), re = (e) => {
+  schema: la
+}), te = (e) => {
   if (e instanceof Date)
     return Number.isNaN(e.getTime()) ? null : e;
   if (typeof e == "number" && Number.isFinite(e)) {
@@ -1410,44 +1411,44 @@ const H = async (e, t) => {
     return Number.isNaN(t.getTime()) ? null : t;
   }
   return null;
-}, ca = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, ua = (e) => {
+}, ua = (e) => !e || e === "system" ? Intl.DateTimeFormat().resolvedOptions().timeZone : e === "unknown" ? "UTC" : e, da = (e) => {
   if (typeof e == "string" && e)
     return e;
-  const t = re(e);
+  const t = te(e);
   return t ? t.toISOString().slice(0, 10) : null;
-}, Bn = () => {
+}, 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 };
-}, da = (e, t, r) => {
+}, pa = (e, t, r) => {
   const a = t?.toLowerCase();
   if (a === "date-only") {
-    const n = ua(e);
-    return n ? st(n, Q("short-date")) : e;
+    const n = da(e);
+    return n ? lt(n, _("short-date")) : e;
   }
   if (a === "time-only") {
     if (typeof e == "string" && e)
-      return lt(e, Q("long-time"));
-    const n = re(e);
-    return n ? fe(n, {
-      ...Q("long-time"),
+      return ct(e, _("long-time"));
+    const n = te(e);
+    return n ? ye(n, {
+      ..._("long-time"),
       timeZone: "UTC"
     }) : e;
   }
-  const o = re(e);
-  return o ? fe(o, {
-    ...Q("short-date-short-time"),
-    timeZone: ca(r)
+  const o = te(e);
+  return o ? ye(o, {
+    ..._("short-date-short-time"),
+    timeZone: ua(r)
   }) : e;
-}, $e = (e, t, r) => {
+}, Re = (e, t, r) => {
   if (e && typeof e != "function") {
     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((s) => s.code === t);
+      const l = o.codedValues.find((i) => i.code === t);
       return l ? l.name : null;
     }
   }
   return null;
-}, pa = (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)) {
@@ -1459,7 +1460,7 @@ const H = async (e, t) => {
     return Number.isNaN(t.getTime()) ? null : t;
   }
   return null;
-}, ha = (e, t) => {
+}, ya = (e, t) => {
   if (typeof e != "number")
     return e;
   const r = {};
@@ -1469,48 +1470,48 @@ const H = async (e, t) => {
   } catch {
     return e;
   }
-}, ya = (e, t, r) => {
-  const a = ma(e);
+}, fa = (e, t, r) => {
+  const a = ha(e);
   if (!a)
     return e;
   const o = {};
-  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 = pa(r);
+  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;
   }
-}, Ce = (e, t) => e.getFieldAlias?.(t) ?? e.fieldsIndex?.get(t)?.alias ?? e.fieldsIndex?.get(t)?.name ?? t, Ee = (e, t, r, a, o) => {
+}, $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" ? ha(r, l) : l?.type === "date-time" ? ya(r, l, o) : da(r, a, o);
-}, fa = (e, t, r, a) => {
-  const o = e.fieldsIndex?.get(t), n = $e(t, r, e) ?? r;
-  return Ee(e, t, n, o?.type, a);
-}, ga = (e, t) => Ce(e, t), Ne = (e, t, r) => {
+  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 = t.features.map((l) => {
-    const s = l.attributes, c = {};
+    const i = l.attributes, c = {};
     return e.fields.forEach((u) => {
-      if (!Object.hasOwn(s, u.name))
+      if (!Object.hasOwn(i, u.name))
         return;
-      const d = s[u.name];
+      const d = i[u.name];
       if (u.name === a) {
         c[u.name] = d;
         return;
       }
-      const p = $e(u.name, d, e) ?? d, m = Ce(e, u.name);
-      c[m] = Ee(e, u.name, p, u.type, r);
+      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 };
-}, wa = (e, t, r) => {
+}, ba = (e, t, r) => {
   const a = e.createQuery();
   return a.outFields = [t], a.where = r || "1=1", a.num = 1, a;
-}, ba = async (e, t, r, a) => {
-  const o = a.map?.allLayers.find((m) => m.id === e), n = wa(o, t, r.where), s = (await o.queryFeatures(n)).features[0], c = s ? s.attributes[t] : null, u = fa(o, t, c, a.timeZone), d = ga(o, t);
+}, 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,
@@ -1523,43 +1524,48 @@ const H = async (e, t) => {
     }
   };
 };
-async function Ta({ layerId: e, fieldName: t, query: r }, a) {
-  const { mapView: o } = F(a), n = await ba(e, t, r, o);
+async function Sa({ 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 va = i.object({
-  layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
-  fieldName: i.string().describe("The name of the field/attribute from which to get a field value."),
-  query: i.object({
-    where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
+const va = s.object({
+  layerId: s.string().describe("The layerId of the layer containing the field from which to get a value."),
+  fieldName: s.string().describe("The name of the field/attribute from which to get a field value."),
+  query: s.object({
+    where: s.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
   })
-}), Sa = f(Ta, {
+}), xa = g(Sa, {
   name: "getAttribute",
   description: "Returns an attribute value for a given feature.",
   schema: va
-}), ce = (e, t, r) => r ? e.hasAllFeaturesInView && e.availableFields === t : e.hasAllFeatures && e.availableFields === t;
+}), 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 xa = async (e) => {
-  const { targetLayer: t, fieldName: r, statisticType: a, mapView: o, layersAndFieldsRegistry: n, geometryFilter: l } = e, s = o.map?.allLayers.find((v) => v.id === t.layerId);
-  if (!s)
+const Ra = async (e) => {
+  const { targetLayer: t, fieldName: r, statisticType: a, mapView: o, layersAndFieldsRegistry: n, geometryFilter: l } = e, i = o.map?.allLayers.find((S) => S.id === t.layerId);
+  if (!i)
     throw new Error(`Layer '${t.layerId}' not found.`);
-  const c = await o.whenLayerView(s), d = n.get(t.layerId)?.fieldRegistry.get(r), p = d?.alias;
+  const c = await o.whenLayerView(i), d = n.get(t.layerId)?.fieldRegistry.get(r), p = d?.alias;
   if (!d)
     throw new Error(`Field '${r}' not found.`);
   let m, y;
   if (l) {
-    const v = await H(l, o);
-    if ("error" in v)
-      throw new Error(v.error);
-    if (!v.geometry)
+    const S = await J(l, o);
+    if ("error" in S)
+      throw new Error(S.error);
+    if (!S.geometry)
       throw j(l) ? new Error(`No features found matching: ${l.where}`) : new Error("Failed to create geometry");
     if (j(l)) {
-      const M = o.map?.allLayers.find((P) => P.id === l.layerId);
+      const Q = o.map?.allLayers.find((A) => A.id === l.layerId);
       m = {
-        geometryLayerName: M?.title ?? M?.id,
+        geometryLayerName: Q?.title ?? Q?.id,
         geometryLayerId: l.layerId,
         geometryWhere: l.where,
         distance: l.distance,
@@ -1573,45 +1579,45 @@ const xa = async (e) => {
       applied: !0
     });
     y = new Se({
-      geometry: v.geometry,
+      geometry: S.geometry,
       distance: l.distance,
       units: l.units,
       spatialRelationship: "intersects"
     });
   }
-  const g = ce(c, [r], !1);
+  const f = le(c, [r], !1);
   let h = null, w = null;
-  const T = 10;
+  const b = 10;
   if (d.type !== "geometry" && d.type !== "oid" && d.type !== "global-id")
     try {
-      const v = {
-        layer: s,
-        useFeaturesInView: g,
-        view: g ? o : void 0,
+      const S = {
+        layer: i,
+        useFeaturesInView: f,
+        view: f ? o : void 0,
         field: r,
-        sqlWhere: K(s.definitionExpression, t.where),
+        sqlWhere: K(i.definitionExpression, t.where),
         ...y && { filter: y },
         outStatisticTypes: { include: [a] }
       };
-      h = await ct(v);
-      const M = ["string", "small-integer", "integer"], P = d.domain?.type === "coded-value" ? d.domain : null;
-      (M.includes(d.type) || P) && (w = (await ut({
-        layer: s,
-        useFeaturesInView: g,
-        view: g ? o : void 0,
+      h = await ut(S);
+      const Q = ["string", "small-integer", "integer"], A = d.domain?.type === "coded-value" ? d.domain : null;
+      (Q.includes(d.type) || A) && (w = (await dt({
+        layer: i,
+        useFeaturesInView: f,
+        view: f ? o : void 0,
         field: r,
-        sqlWhere: K(s.definitionExpression, t.where),
+        sqlWhere: K(i.definitionExpression, t.where),
         ...y && { filter: y }
-      })).uniqueValueInfos.sort((z, ze) => ze.count - z.count).slice(0, T)), w && d.domain?.type === "coded-value" && (w = w.map((z) => ({
-        ...z,
-        value: P ? P.getName(z.value) ?? z.value : z.value
+      })).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
       })));
-    } catch (v) {
-      console.error("Statistics error:", v);
+    } catch (S) {
+      console.error("Statistics error:", S);
     }
   return {
     tool: "getStatistics",
-    layerName: s.title ?? t.layerId,
+    layerName: i.title ?? t.layerId,
     summary: `${a} = ${typeof h?.[a] == "number" ? h[a] : "N/A"}`,
     details: {
       fieldName: r,
@@ -1625,13 +1631,13 @@ const xa = async (e) => {
     }
   };
 };
-async function Ra({
+async function $a({
   targetLayer: e,
   fieldName: t,
   statisticType: r,
   geometryFilter: a
 }, o) {
-  const n = Re(o, "layersAndFieldsRegistry"), { mapView: l } = F(o), s = await xa({
+  const n = xe(o, "layersAndFieldsRegistry"), { mapView: l } = N(o), i = await Ra({
     targetLayer: e,
     fieldName: t,
     statisticType: r,
@@ -1639,34 +1645,34 @@ async function Ra({
     layersAndFieldsRegistry: n,
     geometryFilter: a
   });
-  return JSON.stringify(s, null, 2);
-}
-const $a = i.object({
-  layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
-  where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
-  distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), Ca = i.object({
-  point: i.object({
-    x: i.number().describe("X coordinate (longitude) from navigation result"),
-    y: i.number().describe("Y coordinate (latitude) from navigation result"),
-    spatialReference: i.object({
-      wkid: i.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
+  return JSON.stringify(i, null, 2);
+}
+const Ca = 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.")
+}), Ea = 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"),
+    spatialReference: s.object({
+      wkid: s.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
-  distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), Ea = i.object({
-  targetLayer: i.object({
-    layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
-    where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value.")
+  distance: s.number().optional().describe("Optional buffer distance around the point."),
+  units: F.optional().describe("The units for the distance buffer.")
+}), Fa = 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.")
   }),
-  geometryFilter: i.union([$a, Ca]).optional().describe(
+  geometryFilter: s.union([Ca, Ea]).optional().describe(
     "Geometry filter for spatial queries. Use 'point' option with x/y coordinates from navigation results to find features at that location (point-in-polygon). Use 'layerId/where' option to filter by features from another layer."
   ),
-  fieldName: i.string().describe("The name of the field for which to get statistics. STRICTLY DO NOT use OBJECTID. Use any other field"),
-  statisticType: i.enum(["avg", "max", "median", "min", "stddev", "sum", "variance", "nullcount", "count"]).describe("The statistic type to calculate.")
-}), Na = f(Ra, {
+  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 = 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.
 
@@ -1681,23 +1687,23 @@ DO NOT USE FOR:
 - Simple counts of features matching a condition — use queryFeatures instead
 
 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: Ea
-}), Ia = async (e, t, r, a, o) => {
-  const n = r.map?.allLayers.find((m) => m.id === e.layerId), l = await r.whenLayerView(n), s = n.title ?? e.layerId;
+  schema: Fa
+}), 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 m = await H(a, r);
+    const m = await J(a, r);
     if ("error" in m)
       return {
         tool: "getTopFeatures",
-        layerName: s,
+        layerName: i,
         summary: "Geometry lookup failed",
         details: { error: m.error }
       };
     if (!m.geometry)
       return {
         tool: "getTopFeatures",
-        layerName: s,
+        layerName: i,
         summary: "No features found for geometry filter",
         details: {
           error: `No features found matching: ${"where" in a ? a.where : "unknown criteria"}`
@@ -1709,7 +1715,7 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
   try {
     let m;
     if (u) {
-      const h = new dt({
+      const h = new pt({
         where: e.where || "1=1",
         outFields: p,
         orderByFields: e.orderByFields,
@@ -1717,7 +1723,7 @@ 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 pt({
+        topFilter: new mt({
           topCount: t.topCount,
           groupByFields: t.groupByFields,
           orderByFields: t.orderByFields
@@ -1726,22 +1732,24 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
       m = await n.queryTopFeatures(h);
     } else {
       const h = n.createQuery();
-      h.where = K(n.definitionExpression, e.where || "1=1"), h.outFields = p.length ? p : ["*"], h.orderByFields = t.orderByFields, h.num = t.topCount, 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 = ce(l, e.outFields, o ?? !1);
+      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 {
-        m = w ? await l.queryFeatures(h) : await n.queryFeatures(h);
-      } catch (T) {
-        console.warn("Client-side query failed, falling back to server:", T), m = await n.queryFeatures(h);
+        m = b ? await l.queryFeatures(h) : await n.queryFeatures(h);
+      } catch (v) {
+        console.warn("Client-side query failed, falling back to server:", v), m = await n.queryFeatures(h);
       }
     }
-    const y = m.features.map((h) => h.attributes[d]), { attributes: g } = Ne(n, m, r.timeZone);
+    const y = m.features.map((h) => h.attributes[d]), { attributes: f } = Ee(n, m, r.timeZone);
     return {
       tool: "getTopFeatures",
-      layerName: s,
+      layerName: i,
       summary: `Top ${t.topCount} features extracted`,
       details: {
         topCount: t.topCount,
-        attributes: g,
+        attributes: f,
         objectIds: y,
         objectIdField: d,
         where: e.where,
@@ -1752,164 +1760,166 @@ Only call this tool when the answer requires computing an aggregate (avg, max, m
   } catch (m) {
     return {
       tool: "getTopFeatures",
-      layerName: s,
+      layerName: i,
       summary: "Query failed",
       details: { error: m instanceof Error ? m.message : String(m) }
     };
   }
-}, ka = async ({
+}, Ia = async ({
   targetLayer: e,
   topFilter: t,
   geometryFilter: r,
   useCurrentExtent: a
 }, o) => {
-  const { mapView: n } = F(o), l = await Ia(e, t, n, r, a);
+  const { mapView: n } = N(o), l = await qa(e, t, n, r, a);
   return JSON.stringify(l, null, 2);
-}, Fa = i.object({
-  layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
-  where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
-  distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), za = i.object({
-  point: i.object({
-    x: i.number().describe("X coordinate (longitude) from navigation result"),
-    y: i.number().describe("Y coordinate (latitude) from navigation result"),
-    spatialReference: i.object({
-      wkid: i.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
+}, 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.")
+}), 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"),
+    spatialReference: s.object({
+      wkid: s.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
-  distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), qa = i.object({
-  targetLayer: i.object({
-    layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
-    where: i.string().describe("The SQL-92 where clause representing the feature from which to get an attribute value."),
-    orderByFields: i.array(i.string().describe("The field(s) and order for which to sort the resulting features.")),
-    outFields: i.array(
-      i.string().describe(
+  distance: s.number().optional().describe("Optional buffer distance around the point."),
+  units: F.optional().describe("The units for the distance buffer.")
+}), 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."),
+    orderByFields: s.array(s.string().describe("The field(s) and order for which to sort the resulting features.")),
+    outFields: s.array(
+      s.string().describe(
         'The fields to include in the output that will be presented to the user. This should include identifying information about the resulting features, like a name or id, along with the values desired in the output. If unsure, choose all fields ("*").'
       ).default("*")
     )
   }),
-  geometryFilter: i.union([Fa, 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: i.object({
-    topCount: i.number().describe("Number of top features to return per group."),
-    orderByFields: i.array(
-      i.string().describe("Field(s) to rank by with ASC/DESC. Must be existing field names, not aggregate functions.")
+  topFilter: s.object({
+    topCount: s.number().describe("Number of top features to return per group."),
+    orderByFields: s.array(
+      s.string().describe("Field(s) to rank by with ASC/DESC. Must be existing field names, not aggregate functions.")
     ),
-    groupByFields: i.array(i.string().describe("Field(s) to group results by. Returns top N per group."))
+    groupByFields: s.array(s.string().describe("Field(s) to group results by. Returns top N per group."))
   }).required(),
-  useCurrentExtent: i.boolean().optional().describe(
+  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)."
   )
-}), Da = f(ka, {
+}), 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: qa
-}), ee = 25, Aa = async (e, t, r, a) => {
-  const o = t.map?.allLayers.find((h) => h.id === e.layerId), n = await t.whenLayerView(o), l = o.title ?? e.layerId;
-  let s;
+  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 (r) {
-    const h = await H(r, t);
-    if ("error" in h) {
-      const w = { error: h.error };
+    const w = await J(r, t);
+    if ("error" in w) {
+      const b = { error: w.error };
       if (j(r)) {
-        const T = t.map?.allLayers.find((C) => C.id === r.layerId);
-        w.geometryLayerName = T?.title ?? T?.id, w.geometryLayerId = r.layerId, w.geometryWhere = r.where;
-      } else U(r) && (w.point = r.point);
+        const v = t.map?.allLayers.find((S) => S.id === r.layerId);
+        b.geometryLayerName = v?.title ?? v?.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: w
+        details: b
       };
     }
-    if (!h.geometry) {
-      const w = {};
+    if (!w.geometry) {
+      const b = {};
       if (j(r)) {
-        const T = t.map?.allLayers.find((C) => C.id === r.layerId);
-        w.error = `No features found matching: ${r.where}`, w.geometryLayerName = T?.title ?? T?.id, w.geometryLayerId = r.layerId, w.geometryWhere = r.where;
-      } else U(r) && (w.error = "Failed to create point geometry", w.point = r.point);
+        const v = t.map?.allLayers.find((S) => S.id === r.layerId);
+        b.error = `No features found matching: ${r.where}`, b.geometryLayerName = v?.title ?? v?.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: w
+        details: b
       };
     }
-    s = h.geometry;
-  } else a && (s = t.extent.clone());
-  const c = ce(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, s && (d.geometry = s, d.spatialRelationship = "intersects"), r?.distance && (d.distance = r.distance), r?.units && (d.units = r.units), d.outSpatialReference = t.spatialReference;
-  let p, m;
+    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 && (m = c ? await n.queryFeatures(d) : await o.queryFeatures(d));
-  } catch (h) {
-    console.warn("Client-side query failed, falling back to server:", h), p = await o.queryFeatureCount(d), p > 0 && p <= ee && (m = 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: y, attributes: g } = m ? Ne(o, m, t.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,
-      ...y && { objectIds: y, objectIdField: u },
-      ...g && { attributes: g },
-      ...p > ee && {
-        note: `${p} features found.`
+      ...f && { objectIds: f, objectIdField: d },
+      ...h && { attributes: h },
+      ...m > ee && {
+        note: `${m} features found.`
       }
     }
   };
 };
-async function Pa({
+async function Ga({
   targetLayer: e,
   geometryFilter: t,
   useCurrentExtent: r
 }, a) {
-  const { mapView: o } = F(a), n = await Aa(e, o, t, r);
+  const { mapView: o } = N(a), n = await ja(e, o, t, r);
   return JSON.stringify(n, null, 2);
 }
-const La = i.object({
-  layerId: i.string().describe("The layerId of the layer containing the geometry by which to filter."),
-  where: i.string().describe("The SQL-92 where clause representing the features from which to filter."),
-  distance: i.number().optional().describe("The buffer distance around the geometry."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), ja = i.object({
-  point: i.object({
-    x: i.number().describe("X coordinate (longitude) from navigation result"),
-    y: i.number().describe("Y coordinate (latitude) from navigation result"),
-    spatialReference: i.object({
-      wkid: i.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
+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.")
+}), 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"),
+    spatialReference: s.object({
+      wkid: s.number().describe("Spatial reference WKID (e.g., 4326 for WGS84)")
     }).optional().describe("Spatial reference. Defaults to map's spatial reference if not provided.")
   }).describe("Point coordinates from a previous navigation/geocoding result"),
-  distance: i.number().optional().describe("Optional buffer distance around the point."),
-  units: I.optional().describe("The units for the distance buffer.")
-}), Ga = i.object({
-  targetLayer: i.object({
-    layerId: i.string().describe("The layerId of the layer containing the field from which to get a value."),
-    where: i.string().describe(
+  distance: s.number().optional().describe("Optional buffer distance around the point."),
+  units: F.optional().describe("The units for the distance buffer.")
+}), 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(
       "SQL-92 where clause. IMPORTANT: When using geometryFilter.point for point-in-polygon queries, set this to '1=1' to return all features that intersect the point. Only add attribute filters if the user specifically requests them in addition to the spatial query."
     ),
-    orderByFields: i.array(i.string().describe("The field(s) and order for which to sort the resulting features.")),
-    outFields: i.array(
-      i.string().describe(
+    orderByFields: s.array(s.string().describe("The field(s) and order for which to sort the resulting features.")),
+    outFields: s.array(
+      s.string().describe(
         'The fields to include in the output that will be presented to the user. This should include identifying information about the resulting features, like a name or id, along with the values desired in the output. If unsure, choose all fields ("*").'
       ).default("*")
     )
   }),
-  geometryFilter: i.union([La, ja]).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: i.boolean().optional().describe(
+  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)."
   )
-}), Oa = f(Pa, {
+}), _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. 
 
@@ -1921,55 +1931,55 @@ 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: Ga
-}), Ma = [Sa, Na, Da, Oa], Hn = [la, ea, Zr], Qa = new ot(Ma, { handleToolErrors: !1 });
-async function Jn(e, t) {
-  const { messages: r } = await Qa.invoke({ messages: e.dataExplorationMessages }, t), a = [], o = [];
+  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 s;
-    typeof l != "string" && (s = {
+    let i;
+    typeof l != "string" && (i = {
       tool: n.name ?? "unknown",
       layerName: "unknown",
       summary: "Query failed",
       details: { error: "Skipping non-string tool output:", raw: l }
     });
     try {
-      typeof l == "string" ? s = JSON.parse(l) : s = {
+      typeof l == "string" ? i = JSON.parse(l) : i = {
         tool: n.name ?? "unknown",
         layerName: "unknown",
         summary: "Query failed",
         details: { error: "Invalid tool output type", raw: l }
       };
     } catch {
-      s = {
+      i = {
         tool: n.name ?? "unknown",
         layerName: "unknown",
         summary: "Query failed",
         details: { error: l }
       };
     }
-    a.push(s), s.details && typeof s.details == "object" && "error" in s.details ? o.push(`- ${s.tool}: Error - ${String(s.details.error)}`) : o.push(`- ${s.layerName}: ${s.summary}`);
+    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(", ")}` }, t), {
+  return await x({ text: `Finished executing layer query tool: ${o.join(", ")}` }, t), {
     ...e,
     dataExplorationMessages: [...e.dataExplorationMessages, ...r],
     queryResponse: a,
     status: "success",
-    summary: o.length > 0 ? Vt(o.join(`
+    summary: o.length > 0 ? Bt(o.join(`
 `)) : "Query executed."
   };
 }
-const Zn = b.Root({
-  ...B(),
+const ei = T.Root({
+  ...H(),
   // internal to the help agent
-  helpInternalState: b({
+  helpInternalState: T({
     reducer: L,
     default: () => ({
       toolCallMessage: void 0
     })
   })
-}), _a = (e, t) => {
+}), Ba = (e, t) => {
   const r = Array.from(e.values()).find(
     ({ layerItem: n }) => n.title?.toLowerCase().includes(t.toLowerCase())
   );
@@ -1982,63 +1992,61 @@ const Zn = b.Root({
   return `**${r.layerItem.title}** has ${a.length} field(s):
 
 ${o}`;
-}, Wa = async ({ layerTitle: e }, t) => {
-  const r = Re(t, "layersAndFieldsRegistry");
-  return _a(r, e);
-}, Yn = f(Wa, {
+}, 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: i.object({
-    layerTitle: i.string().describe("The title or partial title of the layer to list fields for.")
+  schema: s.object({
+    layerTitle: s.string().describe("The title or partial title of the layer to list fields for.")
   })
-}), Xn = b.Root({
-  ...B(),
-  intent: b({
+}), ri = T.Root({
+  ...H(),
+  intent: T({
     reducer: (e, t) => t
   }),
-  arcgisKnowledgeMessages: b({
-    reducer: Te,
+  arcgisKnowledgeMessages: T({
+    reducer: be,
     default: () => []
   }),
-  arcgisKnowledgeToolResult: b({
+  arcgisKnowledgeToolResult: T({
     reducer: (e, t) => t,
     default: () => null
   })
-}), _ = {
-  conversationId: ""
-};
-function ue(e) {
+});
+function ce(e) {
   const t = e.map?.allLayers.filter((r) => r.type === "knowledge-graph");
   if (!t || t?.length !== 1)
     throw new Error("The Knowledge Agent currently only supports maps with exactly one Knowledge Graph Layer.");
 }
-function N(e) {
+function q(e) {
   return !!e?.map && !("activeLinkChartLayer" in e.map);
 }
-async function J(e) {
-  !e || N(e) || !e.map?.diagramNodesExtent || await e.goTo(e.map.diagramNodesExtent);
+async function Z(e) {
+  !e || q(e) || !e.map?.diagramNodesExtent || await e.goTo(e.map.diagramNodesExtent);
 }
-function Z(e) {
+function O(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
   if (!("view" in r))
     throw new Error("View context missing");
   const a = r.view;
-  return a.map && !("activeLinkChartLayer" in a.map) && ue(a), {
+  return a.map && !("activeLinkChartLayer" in a.map) && ce(a), {
     view: a
   };
 }
-function ei(e) {
+function ai(e) {
   const r = e?.configurable?.context;
-  if (Ie(e) === "knowledgeGraph")
+  if (Fe(e) === "knowledgeGraph")
     return "knowledgeGraph";
   const o = r.view;
-  return N(o) ? (ue(o), "map") : "linkChart";
+  return q(o) ? (ce(o), "map") : "linkChart";
 }
-async function O(e) {
+async function M(e) {
   const r = e?.configurable?.context;
-  if (Ie(e) === "knowledgeGraph")
+  if (Fe(e) === "knowledgeGraph")
     return r;
   {
     const o = r.view.map;
@@ -2047,22 +2055,22 @@ async function O(e) {
       if (!n)
         throw new Error("Knowledge graph url missing from link chart.");
       return {
-        knowledgeGraph: await ge(n)
+        knowledgeGraph: await fe(n)
       };
     } else {
-      ue(r.view);
+      ce(r.view);
       const l = (r.view.map?.allLayers.find(
         (c) => c.type === "knowledge-graph"
       )).url;
       if (!l)
         throw new Error("Knowledge graph url missing from map.");
       return {
-        knowledgeGraph: await ge(l)
+        knowledgeGraph: await fe(l)
       };
     }
   }
 }
-function Ie(e) {
+function Fe(e) {
   const r = e?.configurable?.context;
   if (!r || typeof r != "object")
     throw new Error("ArcgisKnowledgeAgent context missing");
@@ -2074,12 +2082,12 @@ function Ie(e) {
     return "view";
   throw new Error("ArcgisKnowledgeAgent context must have either a view or knowledgeGraph property.");
 }
-class Va {
+class Ka {
   constructor(t) {
-    this.dataModel = t, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = de.fromDataModel(t);
+    this.dataModel = t, this.kind = "GraphQueryGenerationRequest", this.explainQuery = !0, this.schemaInformation = ue.fromDataModel(t);
   }
 }
-class de {
+class ue {
   constructor() {
     this.schemaType = "ArcgisGraphSchema", this.entityTypes = [], this.relationshipTypes = [], this.identifierInfo = {
       mappingInfo: {
@@ -2089,14 +2097,14 @@ class de {
     };
   }
   static fromDataModel(t) {
-    const r = new de();
+    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(Ua.fromRelationshipType(a));
+      r.relationshipTypes.push(Ha.fromRelationshipType(a));
     return r.identifierInfo = {
       mappingInfo: {
-        identifierMapsTo: Ka(
+        identifierMapsTo: Ja(
           t.identifierInfo.identifierMappingInfo.identifierInfoType
         ),
         identifierPropertyName: t.identifierInfo.identifierMappingInfo.uniformPropertyIdentifier.identifierPropertyName
@@ -2116,13 +2124,13 @@ class G {
   }
   static fromEntityType(t) {
     const r = new G();
-    r.name = t.name, r.alias = t.alias ? t.alias : void 0, r.role = Ba(t.role);
+    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: Ha(a.role),
+        role: Ya(a.role),
         geometryDef: a.fieldType === "esriFieldTypeGeometry" ? {
           geometryType: a.geometryType ?? "esriGeometryAny",
           hasM: a.hasM ? a.hasM : void 0,
@@ -2134,7 +2142,7 @@ class G {
     return r;
   }
 }
-class Ua extends G {
+class Ha extends G {
   constructor() {
     super(...arguments), this.observedEndPoints = [];
   }
@@ -2149,7 +2157,7 @@ class Ua extends G {
     return r;
   }
 }
-const Ka = (e) => {
+const Ja = (e) => {
   switch (e) {
     case "esriIdentifierInfoTypeUNSPECIFIED":
       return "UNSPECIFIED";
@@ -2160,7 +2168,7 @@ const Ka = (e) => {
     default:
       return e;
   }
-}, Ba = (e) => {
+}, Za = (e) => {
   switch (e) {
     case "Regular":
       return "esriGraphNamedObjectRegular";
@@ -2172,7 +2180,7 @@ const Ka = (e) => {
       return e;
   }
 };
-function Ha(e) {
+function Ya(e) {
   switch (e) {
     case "esriGraphPropertyRegular":
       return "Regular";
@@ -2213,82 +2221,148 @@ function Ha(e) {
 function Y(e) {
   return e?.signal;
 }
-function Ja(e, t) {
-  return t ? `${e}
+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: ${t.attemptCount}
 Execution Error: ${t.executionError}
 Failed Query:
-${t.failedGraphQuery}` : e;
+${t.failedGraphQuery}` : `${e} ${r}`;
 }
-async function Za(e, t, r, a) {
-  const { graphQuery: o, explanation: n } = await pe(e, t, r, 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 pe(e, t, r, a, o) {
+async function de(e, t, r, a, o) {
   const n = {
-    message: Ja(e, o),
-    context: new Va(t)
-  };
-  _.conversationId && (n.conversationId = _.conversationId);
-  const l = Y(a);
-  await S({ text: "Attempting to generate a cypher query from your prompt..." }, a);
-  const s = await he(`${r}/chat`, {
+    message: await Xa(e, o),
+    context: new Ka(t)
+  }, l = Y(a);
+  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: {
       "Content-Type": "application/json",
-      token: me.findCredential(k.getDefault().url)?.token ?? ""
+      token: pe.findCredential(k.getDefault().url)?.token ?? ""
     },
     signal: l
   });
-  if (s.httpStatus !== 200)
-    throw new Error(`Graph query service returned an error: ${s.httpStatus}`, {
-      cause: s.data
+  if (i.httpStatus !== 200)
+    throw new Error(`Graph query service returned an error: ${i.httpStatus}`, {
+      cause: i.data
     });
-  _.conversationId || (_.conversationId = s.data.conversationId);
   let c = !1;
   const u = Date.now();
-  let d = s.data.sequenceNumber, p = "", m = "", y = 1;
+  let d = i.data.sequenceNumber, p = "", m = "", y = 1;
   for (; !c; ) {
-    await new Promise((h) => setTimeout(h, 1e3)), await S(
+    await new Promise((h) => setTimeout(h, 1e3)), await x(
       { text: `Periodically requesting status of job from ArcGIS AI Services${"...".substring(0, y)}` },
       a
     ), y = y % 3 + 1;
-    const g = await he(`${r}/chat`, {
+    const f = await me(`${r}/chat`, {
       method: "post",
       body: JSON.stringify({
-        conversationId: s.data.conversationId,
-        inquiryId: s.data.inquiryId,
+        conversationId: i.data.conversationId,
+        inquiryId: i.data.inquiryId,
         ackSequenceNumber: d
       }),
       headers: {
         "Content-Type": "application/json",
-        token: me.findCredential(k.getDefault().url)?.token ?? ""
+        token: pe.findCredential(k.getDefault().url)?.token ?? ""
       },
       signal: l
     });
-    if (g.httpStatus !== 200)
-      throw new Error(`Graph query service polling returned an error: ${g.httpStatus}`, {
-        cause: g.data
+    if (f.httpStatus !== 200)
+      throw new Error(`Graph query service polling returned an error: ${f.httpStatus}`, {
+        cause: f.data
       });
-    if (g.data.context?.kind) {
-      if (g.data.context.kind !== "GraphQueryGenerationResponse")
-        throw new Error(`Unexpected response from graph query service polling. Message: ${g.data.message}`, {
-          cause: g.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 = g.data.context.graphQuery, m = g.data.message || "", c = !0;
-    } else if (!g.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 = g.data.sequenceNumber;
+    d = f.data.sequenceNumber;
   }
   return { graphQuery: p, explanation: m };
 }
-const q = 3;
+function to(e, t) {
+  z(e, (r) => {
+    t.set(`${r.typeName}__${r.id}`, {
+      id: r.id,
+      typeName: r.typeName
+    });
+  });
+}
+function z(e, t) {
+  if (!(!e || typeof e != "object")) {
+    if (ao(e))
+      for (const r of e.path)
+        z(r, t);
+    else if (ro(e))
+      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 ro(e) {
+  return !e || typeof e != "object" || Array.isArray(e) ? !1 : "id" in e && "typeName" in e;
+}
+function ao(e) {
+  return !e || typeof e != "object" || Array.isArray(e) ? !1 : e && "path" in e && Array.isArray(e.path);
+}
+function oo(e) {
+  return !e || typeof e != "object" || Array.isArray(e) || "id" in e ? !1 : "properties" in e && typeof e.properties == "object";
+}
+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: r, relationshipIds: a };
+}
+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: r, nonDynamicTypes: a };
+  const l = [
+    [t.dataModel.entityTypes, r.entityIds],
+    [t.dataModel.relationshipTypes, r.relationshipIds]
+  ];
+  let i = !0;
+  for (const [c, u] of l)
+    for (const d of c) {
+      const p = n.namedTypeDefinitions.get(d.name);
+      if (!p) {
+        i = !1, a.push(d.name);
+        continue;
+      }
+      if (!p.useAllData) {
+        i = !1, a.push(d.name);
+        for (const [m] of p.members || [])
+          u.push(m);
+      }
+    }
+  return { allNamedTypesFullyDynamic: i, bindParameters: r, nonDynamicTypes: a };
+}
+const D = 3;
 function ke(e, t = 100) {
   const r = {};
   for (const a of Object.entries(e.properties ?? {})) {
@@ -2297,10 +2371,10 @@ function ke(e, t = 100) {
   }
   return e.properties = r, e;
 }
-function A(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 Ya = async ({
+const so = async ({
   kg: e,
   queryParams: t,
   targetStructure: r,
@@ -2309,119 +2383,121 @@ const Ya = async ({
   queryRowLimit: n,
   queryTimeoutMs: l
 }) => {
-  let s = null, c = r;
+  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 m = await ht(e, t, o);
-    s = m.resultHeader;
+    const m = await yt(e, t, o);
+    i = m.resultHeader;
     const y = m.resultRowsStream.getReader();
-    let g = 0;
+    let f = 0;
     const h = Date.now(), w = !1;
     for (; ; ) {
-      const { done: T, value: C } = await y.read();
-      if (T)
+      const { done: b, value: v } = await y.read();
+      if (b)
         break;
       if (!w && l && Date.now() - h > l)
         return u.abort(), { type: "timeout" };
-      for (const v of C) {
-        if (g++, n && g > n)
-          return u.abort(), { type: "success", rowLimitReached: !0, resultHeader: s, processedResult: c };
-        c = a(c, v);
+      for (const S of v) {
+        if (f++, n && f > n)
+          return u.abort(), { type: "success", rowLimitReached: !0, resultHeader: i, processedResult: c };
+        c = a(c, S);
       }
     }
   } catch (m) {
-    return u.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: A(m), error: m };
+    return u.signal.aborted ? { type: "aborted" } : { type: "error", errorMessage: P(m), error: m };
   } finally {
     d?.removeEventListener("abort", p);
   }
-  return { type: "success", rowLimitReached: !1, resultHeader: s, processedResult: c };
+  return { type: "success", rowLimitReached: !1, resultHeader: i, processedResult: c };
 };
-async function Fe({
+async function Ne({
   prompt: e,
-  kg: t,
-  graphQueryServiceUrl: r,
-  targetStructure: a,
-  targetStructureReducer: o,
-  requestOptions: n,
-  queryRowLimit: l,
-  queryTimeoutMs: s,
-  config: c
+  bindParameters: t,
+  kg: r,
+  graphQueryServiceUrl: a,
+  targetStructure: o,
+  targetStructureReducer: n,
+  requestOptions: l,
+  queryRowLimit: i,
+  queryTimeoutMs: c,
+  config: u
 }) {
-  let u;
-  for (let d = 1; d <= q; d++) {
-    let p;
+  let d;
+  for (let p = 1; p <= D; p++) {
+    let m;
     try {
-      p = await pe(e, t.dataModel, r, c, u);
-    } catch (g) {
+      m = await de(e, r.dataModel, a, u, d);
+    } catch (h) {
       return {
         type: "generation-error",
-        errorMessage: A(g),
-        error: g
+        errorMessage: P(h),
+        error: h
       };
     }
-    await S(
+    await x(
       {
-        text: `Attempting to execute query: ${p.graphQuery.substring(0, 500)}${p.graphQuery.length > 500 ? "..." : ""}`
+        text: `Attempting to execute query: ${m.graphQuery.substring(0, 500)}${m.graphQuery.length > 500 ? "..." : ""}`
       },
-      c
+      u
     );
-    const m = await Ya({
-      kg: t,
-      queryParams: new xe({
-        openCypherQuery: p.graphQuery
+    const y = await so({
+      kg: r,
+      queryParams: new ve({
+        openCypherQuery: m.graphQuery,
+        bindParameters: t
       }),
-      targetStructure: a,
-      targetStructureReducer: o,
-      requestOptions: n,
-      queryRowLimit: l,
-      queryTimeoutMs: s
-    }), y = m.type === "aborted" ? "Query execution was aborted." : m.type === "timeout" ? "Query execution timed out." : m.type === "error" ? `Query failed with error: ${m.errorMessage}` : "";
-    if (m.type === "success")
+      targetStructure: o,
+      targetStructureReducer: n,
+      requestOptions: l,
+      queryRowLimit: i,
+      queryTimeoutMs: c
+    }), 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: p.graphQuery,
-        explanation: p.explanation,
-        rowLimitReached: m.rowLimitReached,
-        resultHeader: m.resultHeader,
-        processedResult: m.processedResult
+        graphQuery: m.graphQuery,
+        explanation: m.explanation,
+        rowLimitReached: y.rowLimitReached,
+        resultHeader: y.resultHeader,
+        processedResult: y.processedResult
       };
-    if (m.type === "aborted")
+    if (y.type === "aborted")
       return {
         type: "aborted",
-        errorMessage: y,
-        graphQuery: p.graphQuery,
-        explanation: p.explanation
+        errorMessage: f,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       };
-    if (d >= q)
-      return m.type === "timeout" ? {
+    if (p >= D)
+      return y.type === "timeout" ? {
         type: "timeout",
-        errorMessage: y,
-        graphQuery: p.graphQuery,
-        explanation: p.explanation
+        errorMessage: f,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       } : {
         type: "execution-error",
-        errorMessage: y,
-        error: m.error,
-        graphQuery: p.graphQuery,
-        explanation: p.explanation
+        errorMessage: f,
+        error: y.error,
+        graphQuery: m.graphQuery,
+        explanation: m.explanation
       };
-    u = {
-      failedGraphQuery: p.graphQuery,
-      executionError: y,
-      attemptCount: d
-    }, await S(
-      { text: `Attempt ${d} failed with error: ${y}. Retrying...` },
-      c
+    d = {
+      failedGraphQuery: m.graphQuery,
+      executionError: f,
+      attemptCount: p
+    }, await x(
+      { text: `Attempt ${p} failed with error: ${f}. Retrying...` },
+      u
     );
   }
   throw new Error(
-    `Failed to execute generated cypher due to an unexpected error after ${q} attempts.`
+    `Failed to execute generated cypher due to an unexpected error after ${D} attempts.`
   );
 }
-const Xa = async ({
+const lo = async ({
   kg: e,
   searchQuery: t,
   typeCategoryFilter: r,
@@ -2430,17 +2506,17 @@ const Xa = async ({
   requestOptions: n
 }) => {
   const l = [];
-  let s = [r];
-  r === "both" && !e.serviceDefinition.serviceCapabilities.searchCapabilities.searchTypeFilterCapabilities.includes("esriTypeBoth") && (s = ["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 s) {
+    for (const u of i) {
       const d = c - l.length;
       if (d <= 0)
         break;
-      const y = (await yt(
+      const y = (await ft(
         e,
-        new ft({
+        new gt({
           searchQuery: t,
           typeCategoryFilter: u,
           namedTypesFilter: a ?? void 0,
@@ -2448,20 +2524,20 @@ const Xa = async ({
         }),
         n
       )).resultRowsStream.getReader();
-      let g = !1;
-      for (; !g; ) {
+      let f = !1;
+      for (; !f; ) {
         const { done: h, value: w } = await y.read();
         if (h) {
-          g = !0;
+          f = !0;
           break;
         }
-        for (const T of w)
-          for (const C of T)
-            l.push(C);
+        for (const b of w)
+          for (const v of b)
+            l.push(v);
       }
     }
   } catch (u) {
-    const d = A(u);
+    const d = P(u);
     return n?.signal?.aborted ? {
       type: "aborted",
       errorMessage: d,
@@ -2472,120 +2548,110 @@ const Xa = async ({
     type: "success",
     results: l
   };
-};
-function eo(e, t) {
-  D(e, (r) => {
-    t.set(`${r.typeName}__${r.id}`, {
-      id: r.id,
-      typeName: r.typeName
-    });
-  });
-}
-function D(e, t) {
-  if (!(!e || typeof e != "object")) {
-    if (ro(e))
-      for (const r of e.path)
-        D(r, t);
-    else if (to(e))
-      t(e);
-    else if (Array.isArray(e))
-      for (const r of e)
-        D(r, t);
-    else if (ao(e))
-      for (const r of Object.values(e.properties ?? {}))
-        D(r, t);
-  }
-}
-function to(e) {
-  return !e || typeof e != "object" || Array.isArray(e) ? !1 : "id" in e && "typeName" in e;
-}
-function ro(e) {
-  return !e || typeof e != "object" || Array.isArray(e) ? !1 : e && "path" in e && Array.isArray(e.path);
-}
-function ao(e) {
-  return !e || typeof e != "object" || Array.isArray(e) || "id" in e ? !1 : "properties" in e && typeof e.properties == "object";
-}
-function oo(e, t) {
-  const r = [];
-  for (const a of [...t.dataModel.entityTypes, ...t.dataModel.relationshipTypes]) {
-    const o = e.getMemberIdsByType(a.name);
-    for (const n of o)
-      r.push({ id: n, typeName: a.name });
+}, qe = "IMPORTANT: The generated cypher query must return entire entities and relationships ONLY.";
+async function Ie({
+  prompt: e,
+  view: t,
+  knowledgeGraph: r,
+  includeReturnEntityAndRelationshipContext: a = !1
+}) {
+  const o = [e];
+  if (a && o.push(qe), !q(t) && t.map) {
+    const d = await B("arcgis_knowledge_current_lc_context"), p = no(t.map, r);
+    return o.push(d), {
+      enhancedPrompt: o.join(`
+
+`),
+      bindParameters: p,
+      allNamedTypesFullyDynamic: !1
+    };
   }
-  return r;
-}
-function no(e) {
-  const t = [], r = [], o = e?.allLayers.find((n) => n.type === "knowledge-graph")?.inclusionModeDefinition;
-  if (o?.generateAllSublayers)
-    return { allNamedTypesFullyDynamic: !0, idTypePairs: t, dynamicTypes: r };
-  for (const [n, l] of o?.namedTypeDefinitions ?? [])
-    if (l.useAllData)
-      r.push(n);
-    else
-      for (const [s] of l.members)
-        t.push({ id: s, typeName: n });
-  return { allNamedTypesFullyDynamic: !1, idTypePairs: t, dynamicTypes: r };
+  const n = t.map, { allNamedTypesFullyDynamic: l, bindParameters: i, nonDynamicTypes: c } = io(
+    n,
+    r
+  );
+  if (l)
+    return {
+      enhancedPrompt: o.join(`
+
+`),
+      bindParameters: i,
+      allNamedTypesFullyDynamic: !0
+    };
+  const u = (await B("arcgis_knowledge_current_map_context")).replaceAll(
+    "{nonDynamicTypes}",
+    JSON.stringify(c)
+  );
+  return o.push(u), {
+    enhancedPrompt: o.join(`
+
+`),
+    bindParameters: i,
+    allNamedTypesFullyDynamic: l
+  };
 }
-async function io(e, t, r, a, o) {
-  const { view: n } = a, l = await Fe({
+async function co(e, t, r, a, o, n) {
+  const { view: l } = o, i = await Ne({
     prompt: e,
-    kg: t,
-    graphQueryServiceUrl: r,
+    bindParameters: t,
+    kg: r,
+    graphQueryServiceUrl: a,
     targetStructure: /* @__PURE__ */ new Map(),
-    targetStructureReducer: (p, m) => {
-      for (const y of m)
-        eo(y, p);
-      return p;
+    targetStructureReducer: (m, y) => {
+      for (const f of y)
+        to(f, m);
+      return m;
     },
     requestOptions: {
-      signal: Y(o),
-      timeout: o?.timeout
+      signal: Y(n),
+      timeout: n?.timeout
     },
-    config: o
+    config: n
   });
-  if (l.type !== "success") {
-    const p = l.type === "generation-error" ? l.errorMessage : `${l.errorMessage} Cypher query: ${l.graphQuery}`;
-    throw new Error(`Failed to add records to the link chart. ${p}`);
+  if (i.type !== "success") {
+    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: s, explanation: c, processedResult: u } = l, d = Array.from(u.values());
-  return await S(
+  const { graphQuery: c, explanation: u, processedResult: d } = i, p = Array.from(d.values());
+  return await x(
     {
-      text: `Query Results parsed into ${d.length} unique relationships and entities.  Atempting to add to link chart...`
+      text: `Query Results parsed into ${p.length} unique relationships and entities.  Atempting to add to link chart...`
     },
-    o
-  ), !N(n) && n?.map ? (await n.map.addRecords(d), await J(n), { generatedQuery: s, explanation: c, addedIdTypePairs: d }) : (await n?.map?.allLayers.find(
-    (m) => m.type === "knowledge-graph"
-  )?.addRecords(d), { generatedQuery: s, explanation: c, addedIdTypePairs: d });
-}
-const W = "addRecords", so = i.object({
-  prompt: i.string().describe("The user's inquiry into the knowledge graph that needs to be run.")
-}), lo = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await O(t), a = Z(t), { view: o } = a, l = k.getDefault().helperServices;
-  let s = e;
-  if (!N(o) && o.map) {
-    const c = o.map, u = await te("arcgis_knowledge_current_lc_context"), d = oo(c, r);
-    s = `${e}
-
-${u}${JSON.stringify(d)}`;
-  } else if (N(o) && o.map) {
-    const c = o.map, { allNamedTypesFullyDynamic: u, idTypePairs: d, dynamicTypes: p } = no(c), m = await te("arcgis_knowledge_current_map_context");
-    if (s = `${e}
-
-${m}${JSON.stringify(d)} and all entities or relationships with the the following typeNames in the array: ${JSON.stringify(p)}`, u)
-      return {
-        toolName: W,
-        status: "success",
-        summary: "No records have been added to the map because all data in the knowledge graph is contained in the map.",
-        details: {
-          generatedQuery: "N/A",
-          explanation: "All named types in the knowledge graph are fully dynamic and therefore all data is already contained in the map. No records have been added.",
-          addedIdTypePairs: []
-        }
-      };
-  }
+    n
+  ), !q(l) && l?.map ? (await l.map.addRecords(p), await Z(l), { generatedQuery: c, explanation: u, addedIdTypePairs: p }) : (await l?.map?.allLayers.find(
+    (y) => y.type === "knowledge-graph"
+  )?.addRecords(p), { generatedQuery: c, explanation: u, addedIdTypePairs: p });
+}
+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."
+  )
+}), 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: r,
+    includeReturnEntityAndRelationshipContext: !0
+  });
+  if (u)
+    return {
+      toolName: W,
+      status: "success",
+      summary: "No records have been added to the map because all data in the knowledge graph is contained in the map.",
+      details: {
+        generatedQuery: "N/A",
+        explanation: "All named types in the knowledge graph are fully dynamic and therefore all data is already contained in the map. No records have been added.",
+        addedIdTypePairs: []
+      }
+    };
   try {
-    const { generatedQuery: c, explanation: u, addedIdTypePairs: d } = await io(
-      s,
+    const { generatedQuery: d, explanation: p, addedIdTypePairs: m } = await co(
+      i,
+      c,
       r,
       `${l.aiAssistantServices.url}${l.aiAssistantServices.graphQueryAssistant}`,
       a,
@@ -2594,34 +2660,44 @@ ${m}${JSON.stringify(d)} and all entities or relationships with the the followin
     return {
       toolName: W,
       status: "success",
-      summary: `Records added successfully. Cypher Query used: ${c}
+      summary: `Records added successfully. Cypher Query used: ${d}
 
-Number of records added: ${d.length}`,
+Number of records added: ${m.length}`,
       details: {
-        generatedQuery: c,
-        explanation: u,
-        addedIdTypePairs: d
+        generatedQuery: d,
+        explanation: p,
+        addedIdTypePairs: m
       }
     };
-  } catch (c) {
-    const u = A(c);
-    return console.error(`Failed to add records to the link chart. ${u}`, c), {
+  } catch (d) {
+    const p = P(d);
+    return {
       toolName: W,
       status: "error",
-      errorMessage: `Failed to add records to the link chart. ${u}`,
-      error: c
+      errorMessage: `Failed to add records to the link chart. ${p}`,
+      error: d
     };
   }
-}, ti = f(lo, {
+}, 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.",
-  schema: so
+  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. 
+    
+    example prompts:
+    - "add all suppliers and the parts they produce to the link chart"
+    - "show me the competitors of company x and add them to the link chart"
+    - "add the relationships between company x and company y to the link chart"
+    - "expand all the companies"
+    - "expand company x through all the buildings it owns"
+    - "connect company x and company y"
+    - "connect all buildings on the link chart"
+    `,
+  schema: uo
 });
-async function co(e, t) {
-  return await t.map?.applyLayout(e), await J(t), { appliedLayout: e };
+async function mo(e, t) {
+  return await t.map?.applyLayout(e), await Z(t), { appliedLayout: e };
 }
-const ae = "applyLayout", uo = i.object({
-  layout: i.enum([
+const re = "applyLayout", ho = s.object({
+  layout: s.enum([
     "organic-standard",
     "organic-community",
     "basic-grid",
@@ -2634,19 +2710,19 @@ const ae = "applyLayout", uo = i.object({
   ]).describe(
     "The layout mode to apply to the link chart.  The value must be one of the following: organic-standard, organic-community, basic-grid, hierarchical-bottom-to-top, radial-root-centric, tree-left-to-right, geographic-organic-standard, chronological-mono-timeline, chronological-multi-timeline"
   )
-}), po = async ({ layout: e }, t) => {
-  const { view: r } = Z(t);
-  if (N(r))
+}), yo = async ({ layout: e }, t) => {
+  const { view: r } = O(t);
+  if (q(r))
     return {
-      toolName: ae,
+      toolName: re,
       status: "error",
       errorMessage: "The applyLayout tool can only be used with a LinkChartView.",
       error: new Error()
     };
   {
-    const { appliedLayout: a } = await co(e, r);
+    const { appliedLayout: a } = await mo(e, r);
     return {
-      toolName: ae,
+      toolName: re,
       status: "success",
       summary: `Successfully applied layout: ${a}.`,
       details: {
@@ -2654,29 +2730,29 @@ const ae = "applyLayout", uo = i.object({
       }
     };
   }
-}, ri = f(po, {
-  name: ae,
+}, ni = g(yo, {
+  name: re,
   description: "Apply a diagram layout to the link chart",
-  schema: uo
+  schema: ho
 });
-async function mo(e, t) {
-  return t.map?.changeNonspatialDataDisplay(e), await J(t), { appliedNonspatialDataDisplayMode: e };
-}
-const oe = "changeNonspatialVisibility", ho = i.object({
-  setting: i.enum(["hidden", "visible"]).describe("The setting of nonspatial visibility")
-}), yo = async ({ setting: e }, t) => {
-  const { view: r } = Z(t);
-  if (N(r))
+async function fo(e, t) {
+  return t.map?.changeNonspatialDataDisplay(e), await Z(t), { appliedNonspatialDataDisplayMode: e };
+}
+const ae = "changeNonspatialVisibility", go = s.object({
+  setting: s.enum(["hidden", "visible"]).describe("The setting of nonspatial visibility")
+}), wo = async ({ setting: e }, t) => {
+  const { view: r } = O(t);
+  if (q(r))
     return {
-      toolName: oe,
+      toolName: ae,
       status: "error",
       errorMessage: "The changeNonspatialVisibility tool can only be used with a LinkChartView.",
       error: new Error()
     };
   {
-    const { appliedNonspatialDataDisplayMode: a } = await mo(e, r);
+    const { appliedNonspatialDataDisplayMode: a } = await fo(e, r);
     return {
-      toolName: oe,
+      toolName: ae,
       status: "success",
       summary: `Successfully applied nonspatial visibility setting: ${a}.`,
       details: {
@@ -2684,15 +2760,15 @@ const oe = "changeNonspatialVisibility", ho = i.object({
       }
     };
   }
-}, ai = f(yo, {
-  name: oe,
+}, 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: ho
+  schema: go
 });
-async function fo(e, t, r, a, o) {
+async function bo(e, t, r, a, o) {
   let n, l = "";
-  for (let s = 1; s <= q; s++) {
-    const { graphQuery: c, explanation: u } = await pe(
+  for (let i = 1; i <= D; i++) {
+    const { graphQuery: c, explanation: u } = await de(
       e,
       t.dataModel,
       r,
@@ -2700,14 +2776,14 @@ async function fo(e, t, r, a, o) {
       n
     );
     try {
-      await S({ text: `Attempting to create link chart from derived query: ${c}` }, o);
-      const d = await mt.fromCypherQuery(
+      await x({ text: `Attempting to create link chart from derived query: ${c}` }, o);
+      const d = await ht.fromCypherQuery(
         t,
-        new xe({
+        new ve({
           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",
@@ -2715,39 +2791,39 @@ async function fo(e, t, r, a, o) {
 ${c}
 
 Explanation: ${u}`
-      }) : (await J(a), {
+      }) : (await Z(a), {
         type: "success",
         graphQuery: c,
         explanation: u
       });
     } catch (d) {
-      const p = A(d);
-      if (s >= q) {
+      const p = P(d);
+      if (i >= D) {
         l = p;
         break;
       }
       n = {
         failedGraphQuery: c,
         executionError: p,
-        attemptCount: s
-      }, await S(
-        { text: `Attempt ${s} to create link chart failed with error: ${p}. Retrying ...` },
+        attemptCount: i
+      }, await x(
+        { text: `Attempt ${i} to create link chart failed with error: ${p}. Retrying ...` },
         o
       );
     }
   }
   return {
     type: "error",
-    errorMessage: `Failed to create link chart after ${q} attempts. Last error: ${l}`
+    errorMessage: `Failed to create link chart after ${D} attempts. Last error: ${l}`
   };
 }
-const V = "createLinkChart", go = i.object({
-  prompt: i.string().describe(
-    "The user's inquiry into the knowledge graph that needs to be transformed into a link chart visualization."
+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."
   )
-}), wo = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await O(t), { view: a } = Z(t);
-  if (N(a))
+}), So = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), { view: a } = O(t);
+  if (q(a))
     return {
       toolName: V,
       status: "error",
@@ -2755,8 +2831,10 @@ const V = "createLinkChart", go = i.object({
       error: new Error()
     };
   {
-    const n = k.getDefault().helperServices, l = await fo(
-      e,
+    const n = k.getDefault().helperServices, l = await bo(
+      `${e}
+
+${qe}`,
       r,
       `${n.aiAssistantServices.url}${n.aiAssistantServices.graphQueryAssistant}`,
       a,
@@ -2769,107 +2847,116 @@ const V = "createLinkChart", go = i.object({
         errorMessage: l.errorMessage,
         error: new Error()
       };
-    const { graphQuery: s, explanation: c } = l;
+    const { graphQuery: i, explanation: c } = l;
     return {
       toolName: V,
       status: "success",
       summary: `Link chart created successfully.  Cypher Query used to create the link chart: 
-${s}
+${i}
 
 Explanation: ${c}`,
       details: {
-        generatedQuery: s,
+        generatedQuery: i,
         explanation: c
       }
     };
   }
-}, oi = f(wo, {
+}, si = g(So, {
   name: V,
-  description: "Creates a new link chart visualization from an inquiry into the knowledge graph data. The inquiry will retrieve data from the graph database that will serve as the basis for the new link chart.  The user should have explicitly requested the creation of a new link chart from their prompt.",
-  schema: go
-}), ne = "queryGraphData", bo = i.object({
-  prompt: i.string().describe(
-    `The user's inquiry into the knowledge graph, from which a cypher query will be generated and executed to answer the inquiry. IMPORTANT: 
-
-REQUEST LIMIT: If the user does not specifically request for no limits or an explicit limit to be placed on the query, or the number of rows will not be limited by e.g. the number of entity or relationship types in the graph, ensure that the generated query has a reasonable row limit (e.g. 10 rows). 
-
-DESCRIPTIVE COLUMN NAMES: If the user's prompt does not explicitly request for specific column names in the result, ensure that the generated query has descriptive column names (using AS statements) to make the results easier to understand when displayed in a table format.`
+  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: To
+}), oe = "queryGraphData", vo = 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."
   )
-}), To = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await O(t), o = k.getDefault().helperServices, n = await Fe({
+}), 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(t));
+  } catch {
+  }
+  i && ({ enhancedPrompt: n, bindParameters: l } = await Ie({
     prompt: e,
+    view: i,
+    knowledgeGraph: r,
+    includeReturnEntityAndRelationshipContext: !1
+  }));
+  const c = await Ne({
+    prompt: n,
+    bindParameters: l,
     kg: r,
     graphQueryServiceUrl: `${o.aiAssistantServices.url}${o.aiAssistantServices.graphQueryAssistant}`,
     targetStructure: new Array(),
-    targetStructureReducer: (y, g) => (y.push(g), y),
+    targetStructureReducer: (w, b) => (w.push(b), w),
     requestOptions: {
       signal: Y(t),
       timeout: t?.timeout
     },
     config: t
   });
-  if (n.type !== "success") {
-    const y = n.type === "generation-error" ? n.errorMessage : `${n.errorMessage} Cypher query: ${n.graphQuery}`;
+  if (c.type !== "success") {
+    const w = c.type === "generation-error" ? c.errorMessage : `${c.errorMessage} Cypher query: ${c.graphQuery}`;
     return {
-      toolName: ne,
+      toolName: oe,
       status: "error",
-      errorMessage: `Failed to query the knowledge graph. ${y}`,
-      error: "error" in n ? n.error : null
+      errorMessage: `Failed to query the knowledge graph. ${w}`,
+      error: "error" in c ? c.error : null
     };
   }
-  const { graphQuery: l, explanation: s, processedResult: c, resultHeader: u } = n, d = u.headerKeys;
-  for (const y of c)
-    for (const g of y)
-      D(
-        g,
-        (h) => ke(h)
+  const { graphQuery: u, explanation: d, processedResult: p, resultHeader: m } = c, y = m.headerKeys;
+  for (const w of p)
+    for (const b of w)
+      z(
+        b,
+        (v) => ke(v)
       );
-  const p = 50, m = c.slice(0, p).map((y) => JSON.stringify(y));
+  const f = 50, h = p.slice(0, f).map((w) => JSON.stringify(w));
   return {
-    toolName: ne,
+    toolName: oe,
     status: "success",
     summary: `To answer the inquiry, the following cypher query was executed against the knowledge graph:
 
 \`\`\`cypher
-${l}
+${u}
 \`\`\`
 
 Query Results:
-${m.length} result(s) found.
+${h.length} result(s) found.
 
-Column Headers: ${d.join(", ")}
+Column Headers: ${y.join(", ")}
 
-${m.length > p ? `Showing top ${p} results:
+${h.length > f ? `Showing top ${f} results:
 
 ` : `Results:
 
-`}${m.join(`
+`}${h.join(`
 `)}
 `,
     details: {
-      generatedQuery: l,
-      explanation: s,
-      resultHeader: u,
-      queryResults: c
+      generatedQuery: u,
+      explanation: d,
+      resultHeader: m,
+      queryResults: p
     }
   };
-}, ni = f(To, {
-  name: ne,
+}, 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: bo
-}), ie = "generateCypher", vo = i.object({
-  prompt: i.string().describe("The user's inquiry into the knowledge graph that needs to be translated into a cypher query.")
-}), So = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await O(t), o = k.getDefault().helperServices;
+  schema: vo
+}), 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.")
+}), $o = async ({ prompt: e }, t) => {
+  const { knowledgeGraph: r } = await M(t), o = k.getDefault().helperServices;
   try {
-    const { graphQuery: n, explanation: l } = await Za(
+    const { graphQuery: n, explanation: l } = await eo(
       e,
       r.dataModel,
       `${o.aiAssistantServices.url}${o.aiAssistantServices.graphQueryAssistant}`,
       t
     );
     return {
-      toolName: ie,
+      toolName: ne,
       status: "success",
       summary: `Generated Graph Query: 
 ${n}
@@ -2881,69 +2968,70 @@ Explanation: ${l}`,
       }
     };
   } catch (n) {
-    const l = A(n);
+    const l = P(n);
     return {
-      toolName: ie,
+      toolName: ne,
       status: "error",
       errorMessage: `Failed to generate Cypher query. ${l}`,
       error: n
     };
   }
-}, ii = f(So, {
-  name: ie,
+}, 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: vo
-}), xo = (e) => {
+  schema: Ro
+}), Co = (e) => {
   const t = e.dataModel, r = /* @__PURE__ */ new Map();
-  for (const s of t.searchIndexes)
-    if (s.supportedCategory !== "esriTypeMetaEntityProvenance")
-      for (const [c, u] of s.searchProperties.entries()) {
+  for (const i of t.searchIndexes)
+    if (i.supportedCategory !== "esriTypeMetaEntityProvenance")
+      for (const [c, u] of i.searchProperties.entries()) {
         const d = r.get(c) ?? /* @__PURE__ */ new Set();
         u.propertyNames.forEach((p) => d.add(p)), r.set(c, d);
       }
-  const a = t.entityTypes.filter((s) => r.has(s.name)), o = t.relationshipTypes.filter((s) => r.has(s.name)), n = `Entity Types:
-${a.map(({ name: s }) => `${s}: [${Array.from(r.get(s) ?? []).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: s }) => `${s}: [${Array.from(r.get(s) ?? []).join(", ")}]`).join(`
+${o.map(({ name: i }) => `${i}: [${Array.from(r.get(i) ?? []).join(", ")}]`).join(`
 `)}`;
   return `${n}
 
 ${l}`;
 };
-async function Ro(e, t) {
-  const r = await te("arcgis_knowledge_lucene_generation_prompt"), a = {
+async function Eo(e, t, r) {
+  const a = await B("arcgis_knowledge_lucene_generation_prompt"), o = {
     inquiry: e,
-    dataModelForSearch: xo(t)
-  }, o = i.enum(["entity", "relationship", "both"]).describe("The graph element category to search against - entity, relationship, or both"), n = i.number().int().positive().nullable().describe(
+    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."
-  ), l = i.array(
-    i.enum(
-      t.dataModel.entityTypes.map((u) => u.name).concat(t.dataModel.relationshipTypes.map((u) => u.name))
+  ), i = s.array(
+    s.enum(
+      t.dataModel.entityTypes.map((d) => d.name).concat(t.dataModel.relationshipTypes.map((d) => d.name))
     )
-  ).min(1), s = i.object({
-    query: i.string().describe("A lucene syntax query string to be executed against the knowledge graph search API"),
-    typeFilters: l.nullable().describe(
+  ).min(1), c = s.object({
+    query: s.string().describe("A lucene syntax query string to be executed against the knowledge graph search API"),
+    typeFilters: i.nullable().describe(
       "Nullable list of entity or relationship types from the graph to limit the search to. If set to null, search will execute against all named types with indexed properties in the graph"
     ),
-    typeCategoryFilter: o,
-    resultLimit: n
+    typeCategoryFilter: n,
+    resultLimit: l
   });
-  return await De({
-    promptText: r,
-    inputVariables: a,
-    schema: s
+  return await Pe({
+    promptText: a,
+    inputVariables: o,
+    schema: c,
+    config: r
   });
 }
-const se = "searchGraphData", $o = i.object({
-  prompt: i.string().describe(
+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."
   )
-}), Co = async ({ prompt: e }, t) => {
-  const { knowledgeGraph: r } = await O(t);
-  await S({ text: "Generating search query for the user inquiry" }, t);
-  const a = await Ro(e, r);
-  await S({ text: "Executing graph search with generated search query" }, t);
-  const o = await Xa({
+}), 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,
@@ -2956,19 +3044,19 @@ const se = "searchGraphData", $o = i.object({
   });
   if (o.type !== "success")
     return {
-      toolName: se,
+      toolName: ie,
       status: "error",
       errorMessage: o.errorMessage,
       error: "error" in o ? o.error : null
     };
-  for (const s of o.results)
-    D(
-      s,
+  for (const i of o.results)
+    z(
+      i,
       (c) => ke(c)
     );
   const n = 10, l = o.results.slice(0, n);
   return {
-    toolName: se,
+    toolName: ie,
     status: "success",
     summary: `To answer the query, the following lucene query was generated and executed:
     Query: ${a.query}
@@ -2980,63 +3068,72 @@ const se = "searchGraphData", $o = i.object({
     
     ${o.results.length > n ? `Showing top ${n} results:
 
-` : ""}${l.map((s) => JSON.stringify(s)).join(`
+` : ""}${l.map((i) => JSON.stringify(i)).join(`
 `)}`,
     details: {
       generatedSearchQuery: a,
       searchResults: o.results
     }
   };
-}, si = f(Co, {
-  name: se,
-  description: "Allows users to search the knowledge graph for text matching their inquiry, using lucene search syntax, against indexed string properties defined on their entities and relationships. Use this tool when the user asks a question about their knowledge graph data as a whole, that could be answered via lucene text search of properties stored on graph elements, e.g requiring fuzzy matching. Otherwise if the inquiry is looking for connected records (e.g. paths), data aggregations, etc explore the data via the queryGraphData tool.",
-  schema: $o
+}, 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.
+ Example prompts:
+ - "Find 'Bradley'"
+ - "find the person john smith"
+ - "find all people named smith"
+ - "Find all references to 'delayed parts shipment'"
+ - "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: Fo
 });
 export {
-  Pn as A,
-  Ln as B,
-  jn as C,
-  Gn as D,
-  On as E,
-  Mn as F,
-  de as G,
-  Zn as H,
-  Qn as I,
-  _n as J,
-  Wn as K,
-  Vn as L,
-  Un as M,
-  Rn as N,
-  Bn as O,
-  Hn as P,
-  Ma as Q,
-  F as R,
-  Kn as S,
-  Jn as T,
-  ri as a,
-  ii as b,
-  ai as c,
-  oi as d,
-  ti as e,
-  Re as f,
-  te as g,
-  ei as h,
-  O as i,
-  Xn as j,
-  $n as k,
-  Yn as l,
-  Cn as m,
-  En as n,
-  Nn as o,
+  Gn as A,
+  On as B,
+  Mn as C,
+  Qn as D,
+  _n as E,
+  Wn as F,
+  ue as G,
+  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,
+  Jn as S,
+  Xn as T,
+  ni as a,
+  ci as b,
+  ii as c,
+  si as d,
+  oi as e,
+  xe as f,
+  B as g,
+  ai as h,
+  M as i,
+  ri as j,
+  Fn as k,
+  ti as l,
+  kn as m,
+  Nn as n,
+  qn as o,
   In as p,
-  ni as q,
-  Dn as r,
-  si as s,
-  Vt as t,
-  kn as u,
-  Fn as v,
-  zn as w,
-  qn as x,
-  $ as y,
-  An as z
+  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,
+  jn as z
 };