@sisense/mcp-server 0.2.8 → 0.3.0

package/dist/sse-server.js

@@ -5,21 +5,22 @@ import {
   objectType
 } from "./sse-server-ss0mydv4.js";
 import {
+  generateArtifactId,
   require_dist_cjs as require_dist_cjs2,
   sanitizeError,
   sanitizeForDescription,
   sanitizeForText,
   validateToken,
   validateUrl
-} from "./sse-server-qhqncg7f.js";
+} from "./sse-server-yrjhgg0x.js";
 import {
   require_dist_cjs
 } from "./index-bgbnagw5.js";
 import"./index-6vz3bc2n.js";
 import {
-  Kn
-} from "./sse-server-tg36wntb.js";
-import"./sse-server-xfrv5734.js";
+  ni
+} from "./sse-server-f7drtvty.js";
+import"./sse-server-r50cemee.js";
 import"./sse-server-gcjj2741.js";
 import"./sse-server-wb2h6nz7.js";
 import"./sse-server-zmcz2c17.js";
@@ -522,17 +523,17 @@ var require_codegen = __commonJS((exports) => {
       this.nodes = nodes;
     }
     render(opts) {
-      return this.nodes.reduce((code, n) => code + n.render(opts), "");
+      return this.nodes.reduce((code, n2) => code + n2.render(opts), "");
     }
     optimizeNodes() {
       const { nodes } = this;
       let i2 = nodes.length;
       while (i2--) {
-        const n = nodes[i2].optimizeNodes();
-        if (Array.isArray(n))
-          nodes.splice(i2, 1, ...n);
-        else if (n)
-          nodes[i2] = n;
+        const n2 = nodes[i2].optimizeNodes();
+        if (Array.isArray(n2))
+          nodes.splice(i2, 1, ...n2);
+        else if (n2)
+          nodes[i2] = n2;
         else
           nodes.splice(i2, 1);
       }
@@ -542,16 +543,16 @@ var require_codegen = __commonJS((exports) => {
       const { nodes } = this;
       let i2 = nodes.length;
       while (i2--) {
-        const n = nodes[i2];
-        if (n.optimizeNames(names, constants))
+        const n2 = nodes[i2];
+        if (n2.optimizeNames(names, constants))
           continue;
-        subtractNames(names, n.names);
+        subtractNames(names, n2.names);
         nodes.splice(i2, 1);
       }
       return nodes.length > 0 ? this : undefined;
     }
     get names() {
-      return this.nodes.reduce((names, n) => addNames(names, n.names), {});
+      return this.nodes.reduce((names, n2) => addNames(names, n2.names), {});
     }
   }
 
@@ -946,8 +947,8 @@ var require_codegen = __commonJS((exports) => {
     endFunc() {
       return this._endBlockNode(Func);
     }
-    optimize(n = 1) {
-      while (n-- > 0) {
+    optimize(n2 = 1) {
+      while (n2-- > 0) {
         this._root.optimizeNodes();
         this._root.optimizeNames(this._root.names, this._constants);
       }
@@ -961,19 +962,19 @@ var require_codegen = __commonJS((exports) => {
       this._nodes.push(node);
     }
     _endBlockNode(N1, N2) {
-      const n = this._currNode;
-      if (n instanceof N1 || N2 && n instanceof N2) {
+      const n2 = this._currNode;
+      if (n2 instanceof N1 || N2 && n2 instanceof N2) {
         this._nodes.pop();
         return this;
       }
       throw new Error(`CodeGen: not in block "${N2 ? `${N1.kind}/${N2.kind}` : N1.kind}"`);
     }
     _elseNode(node) {
-      const n = this._currNode;
-      if (!(n instanceof If)) {
+      const n2 = this._currNode;
+      if (!(n2 instanceof If)) {
         throw new Error('CodeGen: "else" without "if"');
       }
-      this._currNode = n.else = node;
+      this._currNode = n2.else = node;
       return this;
     }
     get _root() {
@@ -990,8 +991,8 @@ var require_codegen = __commonJS((exports) => {
   }
   exports.CodeGen = CodeGen;
   function addNames(names, from) {
-    for (const n in from)
-      names[n] = (names[n] || 0) + (from[n] || 0);
+    for (const n2 in from)
+      names[n2] = (names[n2] || 0) + (from[n2] || 0);
     return names;
   }
   function addExprNames(names, from) {
@@ -1011,11 +1012,11 @@ var require_codegen = __commonJS((exports) => {
         items.push(c);
       return items;
     }, []));
-    function replaceName(n) {
-      const c = constants[n.str];
-      if (c === undefined || names[n.str] !== 1)
-        return n;
-      delete names[n.str];
+    function replaceName(n2) {
+      const c = constants[n2.str];
+      if (c === undefined || names[n2.str] !== 1)
+        return n2;
+      delete names[n2.str];
       return c;
     }
     function canOptimize(e2) {
@@ -1023,8 +1024,8 @@ var require_codegen = __commonJS((exports) => {
     }
   }
   function subtractNames(names, from) {
-    for (const n in from)
-      names[n] = (names[n] || 0) - (from[n] || 0);
+    for (const n2 in from)
+      names[n2] = (names[n2] || 0) - (from[n2] || 0);
   }
   function not(x) {
     return typeof x == "boolean" || typeof x == "number" || x === null ? !x : (0, code_1._)`!${par(x)}`;
@@ -6886,17 +6887,17 @@ var require_codegen2 = __commonJS((exports) => {
       this.nodes = nodes;
     }
     render(opts) {
-      return this.nodes.reduce((code, n) => code + n.render(opts), "");
+      return this.nodes.reduce((code, n2) => code + n2.render(opts), "");
     }
     optimizeNodes() {
       const { nodes } = this;
       let i2 = nodes.length;
       while (i2--) {
-        const n = nodes[i2].optimizeNodes();
-        if (Array.isArray(n))
-          nodes.splice(i2, 1, ...n);
-        else if (n)
-          nodes[i2] = n;
+        const n2 = nodes[i2].optimizeNodes();
+        if (Array.isArray(n2))
+          nodes.splice(i2, 1, ...n2);
+        else if (n2)
+          nodes[i2] = n2;
         else
           nodes.splice(i2, 1);
       }
@@ -6906,16 +6907,16 @@ var require_codegen2 = __commonJS((exports) => {
       const { nodes } = this;
       let i2 = nodes.length;
       while (i2--) {
-        const n = nodes[i2];
-        if (n.optimizeNames(names, constants))
+        const n2 = nodes[i2];
+        if (n2.optimizeNames(names, constants))
           continue;
-        subtractNames(names, n.names);
+        subtractNames(names, n2.names);
         nodes.splice(i2, 1);
       }
       return nodes.length > 0 ? this : undefined;
     }
     get names() {
-      return this.nodes.reduce((names, n) => addNames(names, n.names), {});
+      return this.nodes.reduce((names, n2) => addNames(names, n2.names), {});
     }
   }
 
@@ -7310,8 +7311,8 @@ var require_codegen2 = __commonJS((exports) => {
     endFunc() {
       return this._endBlockNode(Func);
     }
-    optimize(n = 1) {
-      while (n-- > 0) {
+    optimize(n2 = 1) {
+      while (n2-- > 0) {
         this._root.optimizeNodes();
         this._root.optimizeNames(this._root.names, this._constants);
       }
@@ -7325,19 +7326,19 @@ var require_codegen2 = __commonJS((exports) => {
       this._nodes.push(node);
     }
     _endBlockNode(N1, N2) {
-      const n = this._currNode;
-      if (n instanceof N1 || N2 && n instanceof N2) {
+      const n2 = this._currNode;
+      if (n2 instanceof N1 || N2 && n2 instanceof N2) {
         this._nodes.pop();
         return this;
       }
       throw new Error(`CodeGen: not in block "${N2 ? `${N1.kind}/${N2.kind}` : N1.kind}"`);
     }
     _elseNode(node) {
-      const n = this._currNode;
-      if (!(n instanceof If)) {
+      const n2 = this._currNode;
+      if (!(n2 instanceof If)) {
         throw new Error('CodeGen: "else" without "if"');
       }
-      this._currNode = n.else = node;
+      this._currNode = n2.else = node;
       return this;
     }
     get _root() {
@@ -7354,8 +7355,8 @@ var require_codegen2 = __commonJS((exports) => {
   }
   exports.CodeGen = CodeGen;
   function addNames(names, from) {
-    for (const n in from)
-      names[n] = (names[n] || 0) + (from[n] || 0);
+    for (const n2 in from)
+      names[n2] = (names[n2] || 0) + (from[n2] || 0);
     return names;
   }
   function addExprNames(names, from) {
@@ -7375,11 +7376,11 @@ var require_codegen2 = __commonJS((exports) => {
         items.push(c);
       return items;
     }, []));
-    function replaceName(n) {
-      const c = constants[n.str];
-      if (c === undefined || names[n.str] !== 1)
-        return n;
-      delete names[n.str];
+    function replaceName(n2) {
+      const c = constants[n2.str];
+      if (c === undefined || names[n2.str] !== 1)
+        return n2;
+      delete names[n2.str];
       return c;
     }
     function canOptimize(e2) {
@@ -7387,8 +7388,8 @@ var require_codegen2 = __commonJS((exports) => {
     }
   }
   function subtractNames(names, from) {
-    for (const n in from)
-      names[n] = (names[n] || 0) - (from[n] || 0);
+    for (const n2 in from)
+      names[n2] = (names[n2] || 0) - (from[n2] || 0);
   }
   function not(x) {
     return typeof x == "boolean" || typeof x == "number" || x === null ? !x : (0, code_1._)`!${par(x)}`;
@@ -23564,7 +23565,7 @@ var AssertObjectSchema = custom((v) => v !== null && (typeof v === "object" || t
 var ProgressTokenSchema = union([string2(), number2().int()]);
 var CursorSchema = string2();
 var TaskCreationParamsSchema = looseObject({
-  ttl: union([number2(), _null3()]).optional(),
+  ttl: number2().optional(),
   pollInterval: number2().optional()
 });
 var TaskMetadataSchema = object({
@@ -23718,7 +23719,8 @@ var ClientCapabilitiesSchema = object({
   roots: object({
     listChanged: boolean2().optional()
   }).optional(),
-  tasks: ClientTasksCapabilitySchema.optional()
+  tasks: ClientTasksCapabilitySchema.optional(),
+  extensions: record(string2(), AssertObjectSchema).optional()
 });
 var InitializeRequestParamsSchema = BaseRequestParamsSchema.extend({
   protocolVersion: string2(),
@@ -23744,7 +23746,8 @@ var ServerCapabilitiesSchema = object({
   tools: object({
     listChanged: boolean2().optional()
   }).optional(),
-  tasks: ServerTasksCapabilitySchema.optional()
+  tasks: ServerTasksCapabilitySchema.optional(),
+  extensions: record(string2(), AssertObjectSchema).optional()
 });
 var InitializeResultSchema = ResultSchema.extend({
   protocolVersion: string2(),
@@ -23859,6 +23862,7 @@ var ResourceSchema = object({
   uri: string2(),
   description: optional(string2()),
   mimeType: optional(string2()),
+  size: optional(number2()),
   annotations: AnnotationsSchema.optional(),
   _meta: optional(looseObject({}))
 });
@@ -26859,6 +26863,10 @@ class Protocol {
     this._progressHandlers.clear();
     this._taskProgressTokens.clear();
     this._pendingDebouncedNotifications.clear();
+    for (const info of this._timeoutInfo.values()) {
+      clearTimeout(info.timeoutId);
+    }
+    this._timeoutInfo.clear();
     for (const controller of this._requestHandlerAbortControllers.values()) {
       controller.abort();
     }
@@ -26989,7 +26997,9 @@ class Protocol {
         await capturedTransport?.send(errorResponse);
       }
     }).catch((error40) => this._onerror(new Error(`Failed to send response: ${error40}`))).finally(() => {
-      this._requestHandlerAbortControllers.delete(request.id);
+      if (this._requestHandlerAbortControllers.get(request.id) === abortController) {
+        this._requestHandlerAbortControllers.delete(request.id);
+      }
     });
   }
   _onprogress(notification) {
@@ -27491,10 +27501,74 @@ function mergeCapabilities(base, additional) {
 }
 
 // node_modules/@modelcontextprotocol/ext-apps/dist/src/server/index.js
+class j extends Protocol {
+  _registeredMethods = new Set;
+  _eventSlots = new Map;
+  onEventDispatch(Z, $) {}
+  _ensureEventSlot(Z) {
+    let $ = this._eventSlots.get(Z);
+    if (!$) {
+      let J = this.eventSchemas[Z];
+      if (!J)
+        throw Error(`Unknown event: ${String(Z)}`);
+      $ = { listeners: [] }, this._eventSlots.set(Z, $);
+      let X = J.shape.method.value;
+      this._registeredMethods.add(X);
+      let V = $;
+      super.setNotificationHandler(J, (D) => {
+        let G = D.params;
+        this.onEventDispatch(Z, G), V.onHandler?.(G);
+        for (let L of [...V.listeners])
+          L(G);
+      });
+    }
+    return $;
+  }
+  setEventHandler(Z, $) {
+    let J = this._ensureEventSlot(Z);
+    if (J.onHandler && $)
+      console.warn(`[MCP Apps] on${String(Z)} handler replaced. Use addEventListener("${String(Z)}", …) to add multiple listeners without replacing.`);
+    J.onHandler = $;
+  }
+  getEventHandler(Z) {
+    return this._eventSlots.get(Z)?.onHandler;
+  }
+  addEventListener(Z, $) {
+    this._ensureEventSlot(Z).listeners.push($);
+  }
+  removeEventListener(Z, $) {
+    let J = this._eventSlots.get(Z);
+    if (!J)
+      return;
+    let X = J.listeners.indexOf($);
+    if (X !== -1)
+      J.listeners.splice(X, 1);
+  }
+  setRequestHandler = (Z, $) => {
+    this._assertMethodNotRegistered(Z, "setRequestHandler"), super.setRequestHandler(Z, $);
+  };
+  setNotificationHandler = (Z, $) => {
+    this._assertMethodNotRegistered(Z, "setNotificationHandler"), super.setNotificationHandler(Z, $);
+  };
+  warnIfRequestHandlerReplaced(Z, $, J) {
+    if ($ && J)
+      console.warn(`[MCP Apps] ${Z} handler replaced. Previous handler will no longer be called.`);
+  }
+  replaceRequestHandler = (Z, $) => {
+    let J = Z.shape.method.value;
+    this._registeredMethods.add(J), super.setRequestHandler(Z, $);
+  };
+  _assertMethodNotRegistered(Z, $) {
+    let J = Z.shape.method.value;
+    if (this._registeredMethods.has(J))
+      throw Error(`Handler for "${J}" already registered (via ${$}). Use addEventListener() to attach multiple listeners, or the on* setter for replace semantics.`);
+    this._registeredMethods.add(J);
+  }
+}
 var F = "2026-01-26";
 var z = "ui/notifications/tool-input-partial";
 
-class j {
+class B {
   eventTarget;
   eventSource;
   messageListener;
@@ -27532,10 +27606,10 @@ class j {
   sessionId;
   setProtocolVersion;
 }
-var b = exports_external2.union([exports_external2.literal("light"), exports_external2.literal("dark")]).describe("Color theme preference for the host environment.");
-var L = exports_external2.union([exports_external2.literal("inline"), exports_external2.literal("fullscreen"), exports_external2.literal("pip")]).describe("Display mode for UI presentation.");
+var S = exports_external2.union([exports_external2.literal("light"), exports_external2.literal("dark")]).describe("Color theme preference for the host environment.");
+var W = exports_external2.union([exports_external2.literal("inline"), exports_external2.literal("fullscreen"), exports_external2.literal("pip")]).describe("Display mode for UI presentation.");
 var i = exports_external2.union([exports_external2.literal("--color-background-primary"), exports_external2.literal("--color-background-secondary"), exports_external2.literal("--color-background-tertiary"), exports_external2.literal("--color-background-inverse"), exports_external2.literal("--color-background-ghost"), exports_external2.literal("--color-background-info"), exports_external2.literal("--color-background-danger"), exports_external2.literal("--color-background-success"), exports_external2.literal("--color-background-warning"), exports_external2.literal("--color-background-disabled"), exports_external2.literal("--color-text-primary"), exports_external2.literal("--color-text-secondary"), exports_external2.literal("--color-text-tertiary"), exports_external2.literal("--color-text-inverse"), exports_external2.literal("--color-text-ghost"), exports_external2.literal("--color-text-info"), exports_external2.literal("--color-text-danger"), exports_external2.literal("--color-text-success"), exports_external2.literal("--color-text-warning"), exports_external2.literal("--color-text-disabled"), exports_external2.literal("--color-border-primary"), exports_external2.literal("--color-border-secondary"), exports_external2.literal("--color-border-tertiary"), exports_external2.literal("--color-border-inverse"), exports_external2.literal("--color-border-ghost"), exports_external2.literal("--color-border-info"), exports_external2.literal("--color-border-danger"), exports_external2.literal("--color-border-success"), exports_external2.literal("--color-border-warning"), exports_external2.literal("--color-border-disabled"), exports_external2.literal("--color-ring-primary"), exports_external2.literal("--color-ring-secondary"), exports_external2.literal("--color-ring-inverse"), exports_external2.literal("--color-ring-info"), exports_external2.literal("--color-ring-danger"), exports_external2.literal("--color-ring-success"), exports_external2.literal("--color-ring-warning"), exports_external2.literal("--font-sans"), exports_external2.literal("--font-mono"), exports_external2.literal("--font-weight-normal"), exports_external2.literal("--font-weight-medium"), exports_external2.literal("--font-weight-semibold"), exports_external2.literal("--font-weight-bold"), exports_external2.literal("--font-text-xs-size"), exports_external2.literal("--font-text-sm-size"), exports_external2.literal("--font-text-md-size"), exports_external2.literal("--font-text-lg-size"), exports_external2.literal("--font-heading-xs-size"), exports_external2.literal("--font-heading-sm-size"), exports_external2.literal("--font-heading-md-size"), exports_external2.literal("--font-heading-lg-size"), exports_external2.literal("--font-heading-xl-size"), exports_external2.literal("--font-heading-2xl-size"), exports_external2.literal("--font-heading-3xl-size"), exports_external2.literal("--font-text-xs-line-height"), exports_external2.literal("--font-text-sm-line-height"), exports_external2.literal("--font-text-md-line-height"), exports_external2.literal("--font-text-lg-line-height"), exports_external2.literal("--font-heading-xs-line-height"), exports_external2.literal("--font-heading-sm-line-height"), exports_external2.literal("--font-heading-md-line-height"), exports_external2.literal("--font-heading-lg-line-height"), exports_external2.literal("--font-heading-xl-line-height"), exports_external2.literal("--font-heading-2xl-line-height"), exports_external2.literal("--font-heading-3xl-line-height"), exports_external2.literal("--border-radius-xs"), exports_external2.literal("--border-radius-sm"), exports_external2.literal("--border-radius-md"), exports_external2.literal("--border-radius-lg"), exports_external2.literal("--border-radius-xl"), exports_external2.literal("--border-radius-full"), exports_external2.literal("--border-width-regular"), exports_external2.literal("--shadow-hairline"), exports_external2.literal("--shadow-sm"), exports_external2.literal("--shadow-md"), exports_external2.literal("--shadow-lg")]).describe("CSS variable keys available to MCP apps for theming.");
-var o = exports_external2.record(i.describe(`Style variables for theming MCP apps.
+var n = exports_external2.record(i.describe(`Style variables for theming MCP apps.
 
 Individual style keys are optional - hosts may provide any subset of these values.
 Values are strings containing CSS values (colors, sizes, font stacks, etc.).
@@ -27554,29 +27628,30 @@ Values are strings containing CSS values (colors, sizes, font stacks, etc.).
 
 Note: This type uses \`Record<K, string | undefined>\` rather than \`Partial<Record<K, string>>\`
 for compatibility with Zod schema generation. Both are functionally equivalent for validation.`);
-var a = exports_external2.object({ method: exports_external2.literal("ui/open-link"), params: exports_external2.object({ url: exports_external2.string().describe("URL to open in the host's browser") }) });
+var o = exports_external2.object({ method: exports_external2.literal("ui/open-link"), params: exports_external2.object({ url: exports_external2.string().describe("URL to open in the host's browser") }) });
 var O = exports_external2.object({ isError: exports_external2.boolean().optional().describe("True if the host failed to open the URL (e.g., due to security policy).") }).passthrough();
 var I = exports_external2.object({ isError: exports_external2.boolean().optional().describe("True if the download failed (e.g., user cancelled or host denied).") }).passthrough();
 var w = exports_external2.object({ isError: exports_external2.boolean().optional().describe("True if the host rejected or failed to deliver the message.") }).passthrough();
-var s = exports_external2.object({ method: exports_external2.literal("ui/notifications/sandbox-proxy-ready"), params: exports_external2.object({}) });
-var B = exports_external2.object({ connectDomains: exports_external2.array(exports_external2.string()).optional().describe(`Origins for network requests (fetch/XHR/WebSocket).
+var a = exports_external2.object({ method: exports_external2.literal("ui/notifications/sandbox-proxy-ready"), params: exports_external2.object({}) });
+var K = exports_external2.object({ connectDomains: exports_external2.array(exports_external2.string()).optional().describe(`Origins for network requests (fetch/XHR/WebSocket).
 
 - Maps to CSP \`connect-src\` directive
 - Empty or omitted → no network connections (secure default)`), resourceDomains: exports_external2.array(exports_external2.string()).optional().describe("Origins for static resources (images, scripts, stylesheets, fonts, media).\n\n- Maps to CSP `img-src`, `script-src`, `style-src`, `font-src`, `media-src` directives\n- Wildcard subdomains supported: `https://*.example.com`\n- Empty or omitted → no network resources (secure default)"), frameDomains: exports_external2.array(exports_external2.string()).optional().describe("Origins for nested iframes.\n\n- Maps to CSP `frame-src` directive\n- Empty or omitted → no nested iframes allowed (`frame-src 'none'`)"), baseUriDomains: exports_external2.array(exports_external2.string()).optional().describe("Allowed base URIs for the document.\n\n- Maps to CSP `base-uri` directive\n- Empty or omitted → only same origin allowed (`base-uri 'self'`)") });
-var K = exports_external2.object({ camera: exports_external2.object({}).optional().describe("Request camera access.\n\nMaps to Permission Policy `camera` feature."), microphone: exports_external2.object({}).optional().describe("Request microphone access.\n\nMaps to Permission Policy `microphone` feature."), geolocation: exports_external2.object({}).optional().describe("Request geolocation access.\n\nMaps to Permission Policy `geolocation` feature."), clipboardWrite: exports_external2.object({}).optional().describe("Request clipboard write access.\n\nMaps to Permission Policy `clipboard-write` feature.") });
-var t = exports_external2.object({ method: exports_external2.literal("ui/notifications/size-changed"), params: exports_external2.object({ width: exports_external2.number().optional().describe("New width in pixels."), height: exports_external2.number().optional().describe("New height in pixels.") }) });
+var N = exports_external2.object({ camera: exports_external2.object({}).optional().describe("Request camera access.\n\nMaps to Permission Policy `camera` feature."), microphone: exports_external2.object({}).optional().describe("Request microphone access.\n\nMaps to Permission Policy `microphone` feature."), geolocation: exports_external2.object({}).optional().describe("Request geolocation access.\n\nMaps to Permission Policy `geolocation` feature."), clipboardWrite: exports_external2.object({}).optional().describe("Request clipboard write access.\n\nMaps to Permission Policy `clipboard-write` feature.") });
+var s = exports_external2.object({ method: exports_external2.literal("ui/notifications/size-changed"), params: exports_external2.object({ width: exports_external2.number().optional().describe("New width in pixels."), height: exports_external2.number().optional().describe("New height in pixels.") }) });
 var A = exports_external2.object({ method: exports_external2.literal("ui/notifications/tool-input"), params: exports_external2.object({ arguments: exports_external2.record(exports_external2.string(), exports_external2.unknown().describe("Complete tool call arguments as key-value pairs.")).optional().describe("Complete tool call arguments as key-value pairs.") }) });
 var P = exports_external2.object({ method: exports_external2.literal("ui/notifications/tool-input-partial"), params: exports_external2.object({ arguments: exports_external2.record(exports_external2.string(), exports_external2.unknown().describe("Partial tool call arguments (incomplete, may change).")).optional().describe("Partial tool call arguments (incomplete, may change).") }) });
 var H = exports_external2.object({ method: exports_external2.literal("ui/notifications/tool-cancelled"), params: exports_external2.object({ reason: exports_external2.string().optional().describe('Optional reason for the cancellation (e.g., "user action", "timeout").') }) });
-var g = exports_external2.object({ fonts: exports_external2.string().optional() });
-var C = exports_external2.object({ variables: o.optional().describe("CSS variables for theming the app."), css: g.optional().describe("CSS blocks that apps can inject.") });
+var b = exports_external2.object({ fonts: exports_external2.string().optional() });
+var C = exports_external2.object({ variables: n.optional().describe("CSS variables for theming the app."), css: b.optional().describe("CSS blocks that apps can inject.") });
 var _ = exports_external2.object({ method: exports_external2.literal("ui/resource-teardown"), params: exports_external2.object({}) });
-var e = exports_external2.record(exports_external2.string(), exports_external2.unknown());
+var t = exports_external2.record(exports_external2.string(), exports_external2.unknown());
 var q = exports_external2.object({ text: exports_external2.object({}).optional().describe("Host supports text content blocks."), image: exports_external2.object({}).optional().describe("Host supports image content blocks."), audio: exports_external2.object({}).optional().describe("Host supports audio content blocks."), resource: exports_external2.object({}).optional().describe("Host supports resource content blocks."), resourceLink: exports_external2.object({}).optional().describe("Host supports resource link content blocks."), structuredContent: exports_external2.object({}).optional().describe("Host supports structured content.") });
-var y = exports_external2.object({ experimental: exports_external2.object({}).optional().describe("Experimental features (structure TBD)."), openLinks: exports_external2.object({}).optional().describe("Host supports opening external URLs."), downloadFile: exports_external2.object({}).optional().describe("Host supports file downloads via ui/download-file."), serverTools: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("Host supports tools/list_changed notifications.") }).optional().describe("Host can proxy tool calls to the MCP server."), serverResources: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("Host supports resources/list_changed notifications.") }).optional().describe("Host can proxy resource reads to the MCP server."), logging: exports_external2.object({}).optional().describe("Host accepts log messages."), sandbox: exports_external2.object({ permissions: K.optional().describe("Permissions granted by the host (camera, microphone, geolocation)."), csp: B.optional().describe("CSP domains approved by the host.") }).optional().describe("Sandbox configuration applied by the host."), updateModelContext: q.optional().describe("Host accepts context updates (ui/update-model-context) to be included in the model's context for future turns."), message: q.optional().describe("Host supports receiving content messages (ui/message) from the view.") });
-var u = exports_external2.object({ experimental: exports_external2.object({}).optional().describe("Experimental features (structure TBD)."), tools: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("App supports tools/list_changed notifications.") }).optional().describe("App exposes MCP-style tools that the host can call."), availableDisplayModes: exports_external2.array(L).optional().describe("Display modes the app supports.") });
+var e = exports_external2.object({ method: exports_external2.literal("ui/notifications/request-teardown"), params: exports_external2.object({}).optional() });
+var y = exports_external2.object({ experimental: exports_external2.object({}).optional().describe("Experimental features (structure TBD)."), openLinks: exports_external2.object({}).optional().describe("Host supports opening external URLs."), downloadFile: exports_external2.object({}).optional().describe("Host supports file downloads via ui/download-file."), serverTools: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("Host supports tools/list_changed notifications.") }).optional().describe("Host can proxy tool calls to the MCP server."), serverResources: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("Host supports resources/list_changed notifications.") }).optional().describe("Host can proxy resource reads to the MCP server."), logging: exports_external2.object({}).optional().describe("Host accepts log messages."), sandbox: exports_external2.object({ permissions: N.optional().describe("Permissions granted by the host (camera, microphone, geolocation)."), csp: K.optional().describe("CSP domains approved by the host.") }).optional().describe("Sandbox configuration applied by the host."), updateModelContext: q.optional().describe("Host accepts context updates (ui/update-model-context) to be included in the model's context for future turns."), message: q.optional().describe("Host supports receiving content messages (ui/message) from the view.") });
+var v = exports_external2.object({ experimental: exports_external2.object({}).optional().describe("Experimental features (structure TBD)."), tools: exports_external2.object({ listChanged: exports_external2.boolean().optional().describe("App supports tools/list_changed notifications.") }).optional().describe("App exposes MCP-style tools that the host can call."), availableDisplayModes: exports_external2.array(W).optional().describe("Display modes the app supports.") });
 var QQ = exports_external2.object({ method: exports_external2.literal("ui/notifications/initialized"), params: exports_external2.object({}).optional() });
-var ZQ = exports_external2.object({ csp: B.optional().describe("Content Security Policy configuration for UI resources."), permissions: K.optional().describe("Sandbox permissions requested by the UI resource."), domain: exports_external2.string().optional().describe(`Dedicated origin for view sandbox.
+var ZQ = exports_external2.object({ csp: K.optional().describe("Content Security Policy configuration for UI resources."), permissions: N.optional().describe("Sandbox permissions requested by the UI resource."), domain: exports_external2.string().optional().describe(`Dedicated origin for view sandbox.
 
 Useful when views need stable, dedicated origins for OAuth callbacks, CORS policies, or API key allowlists.
 
@@ -27591,33 +27666,38 @@ Boolean requesting whether a visible border and background is provided by the ho
 - \`true\`: request visible border + background
 - \`false\`: request no visible border + background
 - omitted: host decides border`) });
-var $Q = exports_external2.object({ method: exports_external2.literal("ui/request-display-mode"), params: exports_external2.object({ mode: L.describe("The display mode being requested.") }) });
-var T = exports_external2.object({ mode: L.describe("The display mode that was actually set. May differ from requested if not supported.") }).passthrough();
+var $Q = exports_external2.object({ method: exports_external2.literal("ui/request-display-mode"), params: exports_external2.object({ mode: W.describe("The display mode being requested.") }) });
+var T = exports_external2.object({ mode: W.describe("The display mode that was actually set. May differ from requested if not supported.") }).passthrough();
 var f = exports_external2.union([exports_external2.literal("model"), exports_external2.literal("app")]).describe("Tool visibility scope - who can access the tool.");
 var JQ = exports_external2.object({ resourceUri: exports_external2.string().optional(), visibility: exports_external2.array(f).optional().describe(`Who can access this tool. Default: ["model", "app"]
 - "model": Tool visible to and callable by the agent
 - "app": Tool callable by the app from this server only`) });
-var kQ = exports_external2.object({ mimeTypes: exports_external2.array(exports_external2.string()).optional().describe('Array of supported MIME types for UI resources.\nMust include `"text/html;profile=mcp-app"` for MCP Apps support.') });
+var UQ = exports_external2.object({ mimeTypes: exports_external2.array(exports_external2.string()).optional().describe('Array of supported MIME types for UI resources.\nMust include `"text/html;profile=mcp-app"` for MCP Apps support.') });
 var XQ = exports_external2.object({ method: exports_external2.literal("ui/download-file"), params: exports_external2.object({ contents: exports_external2.array(exports_external2.union([EmbeddedResourceSchema, ResourceLinkSchema])).describe("Resource contents to download — embedded (inline data) or linked (host fetches). Uses standard MCP resource types.") }) });
 var VQ = exports_external2.object({ method: exports_external2.literal("ui/message"), params: exports_external2.object({ role: exports_external2.literal("user").describe('Message role, currently only "user" is supported.'), content: exports_external2.array(ContentBlockSchema).describe("Message content blocks (text, image, etc.).") }) });
-var DQ = exports_external2.object({ method: exports_external2.literal("ui/notifications/sandbox-resource-ready"), params: exports_external2.object({ html: exports_external2.string().describe("HTML content to load into the inner iframe."), sandbox: exports_external2.string().optional().describe("Optional override for the inner iframe's sandbox attribute."), csp: B.optional().describe("CSP configuration from resource metadata."), permissions: K.optional().describe("Sandbox permissions from resource metadata.") }) });
-var U = exports_external2.object({ method: exports_external2.literal("ui/notifications/tool-result"), params: CallToolResultSchema.describe("Standard MCP tool execution result.") });
-var k = exports_external2.object({ toolInfo: exports_external2.object({ id: RequestIdSchema.optional().describe("JSON-RPC id of the tools/call request."), tool: ToolSchema.describe("Tool definition including name, inputSchema, etc.") }).optional().describe("Metadata of the tool call that instantiated this App."), theme: b.optional().describe("Current color theme preference."), styles: C.optional().describe("Style configuration for theming the app."), displayMode: L.optional().describe("How the UI is currently displayed."), availableDisplayModes: exports_external2.array(L).optional().describe("Display modes the host supports."), containerDimensions: exports_external2.union([exports_external2.object({ height: exports_external2.number().describe("Fixed container height in pixels.") }), exports_external2.object({ maxHeight: exports_external2.union([exports_external2.number(), exports_external2.undefined()]).optional().describe("Maximum container height in pixels.") })]).and(exports_external2.union([exports_external2.object({ width: exports_external2.number().describe("Fixed container width in pixels.") }), exports_external2.object({ maxWidth: exports_external2.union([exports_external2.number(), exports_external2.undefined()]).optional().describe("Maximum container width in pixels.") })])).optional().describe(`Container dimensions. Represents the dimensions of the iframe or other
+var DQ = exports_external2.object({ method: exports_external2.literal("ui/notifications/sandbox-resource-ready"), params: exports_external2.object({ html: exports_external2.string().describe("HTML content to load into the inner iframe."), sandbox: exports_external2.string().optional().describe("Optional override for the inner iframe's sandbox attribute."), csp: K.optional().describe("CSP configuration from resource metadata."), permissions: N.optional().describe("Sandbox permissions from resource metadata.") }) });
+var R = exports_external2.object({ method: exports_external2.literal("ui/notifications/tool-result"), params: CallToolResultSchema.describe("Standard MCP tool execution result.") });
+var E = exports_external2.object({ toolInfo: exports_external2.object({ id: RequestIdSchema.optional().describe("JSON-RPC id of the tools/call request."), tool: ToolSchema.describe("Tool definition including name, inputSchema, etc.") }).optional().describe("Metadata of the tool call that instantiated this App."), theme: S.optional().describe("Current color theme preference."), styles: C.optional().describe("Style configuration for theming the app."), displayMode: W.optional().describe("How the UI is currently displayed."), availableDisplayModes: exports_external2.array(W).optional().describe("Display modes the host supports."), containerDimensions: exports_external2.union([exports_external2.object({ height: exports_external2.number().describe("Fixed container height in pixels.") }), exports_external2.object({ maxHeight: exports_external2.union([exports_external2.number(), exports_external2.undefined()]).optional().describe("Maximum container height in pixels.") })]).and(exports_external2.union([exports_external2.object({ width: exports_external2.number().describe("Fixed container width in pixels.") }), exports_external2.object({ maxWidth: exports_external2.union([exports_external2.number(), exports_external2.undefined()]).optional().describe("Maximum container width in pixels.") })])).optional().describe(`Container dimensions. Represents the dimensions of the iframe or other
 container holding the app. Specify either width or maxWidth, and either height or maxHeight.`), locale: exports_external2.string().optional().describe("User's language and region preference in BCP 47 format."), timeZone: exports_external2.string().optional().describe("User's timezone in IANA format."), userAgent: exports_external2.string().optional().describe("Host application identifier."), platform: exports_external2.union([exports_external2.literal("web"), exports_external2.literal("desktop"), exports_external2.literal("mobile")]).optional().describe("Platform type for responsive design decisions."), deviceCapabilities: exports_external2.object({ touch: exports_external2.boolean().optional().describe("Whether the device supports touch input."), hover: exports_external2.boolean().optional().describe("Whether the device supports hover interactions.") }).optional().describe("Device input capabilities."), safeAreaInsets: exports_external2.object({ top: exports_external2.number().describe("Top safe area inset in pixels."), right: exports_external2.number().describe("Right safe area inset in pixels."), bottom: exports_external2.number().describe("Bottom safe area inset in pixels."), left: exports_external2.number().describe("Left safe area inset in pixels.") }).optional().describe("Mobile safe area boundaries in pixels.") }).passthrough();
-var E = exports_external2.object({ method: exports_external2.literal("ui/notifications/host-context-changed"), params: k.describe("Partial context update containing only changed fields.") });
-var LQ = exports_external2.object({ method: exports_external2.literal("ui/update-model-context"), params: exports_external2.object({ content: exports_external2.array(ContentBlockSchema).optional().describe("Context content blocks (text, image, etc.)."), structuredContent: exports_external2.record(exports_external2.string(), exports_external2.unknown().describe("Structured content for machine-readable context data.")).optional().describe("Structured content for machine-readable context data.") }) });
-var GQ = exports_external2.object({ method: exports_external2.literal("ui/initialize"), params: exports_external2.object({ appInfo: ImplementationSchema.describe("App identification (name and version)."), appCapabilities: u.describe("Features and capabilities this app provides."), protocolVersion: exports_external2.string().describe("Protocol version this app supports.") }) });
-var R = exports_external2.object({ protocolVersion: exports_external2.string().describe('Negotiated protocol version string (e.g., "2025-11-21").'), hostInfo: ImplementationSchema.describe("Host application identification and version."), hostCapabilities: y.describe("Features and capabilities provided by the host."), hostContext: k.describe("Rich context about the host environment.") }).passthrough();
-var v = "ui/resourceUri";
-var d = "text/html;profile=mcp-app";
-
-class qQ extends Protocol {
+var U = exports_external2.object({ method: exports_external2.literal("ui/notifications/host-context-changed"), params: E.describe("Partial context update containing only changed fields.") });
+var GQ = exports_external2.object({ method: exports_external2.literal("ui/update-model-context"), params: exports_external2.object({ content: exports_external2.array(ContentBlockSchema).optional().describe("Context content blocks (text, image, etc.)."), structuredContent: exports_external2.record(exports_external2.string(), exports_external2.unknown().describe("Structured content for machine-readable context data.")).optional().describe("Structured content for machine-readable context data.") }) });
+var LQ = exports_external2.object({ method: exports_external2.literal("ui/initialize"), params: exports_external2.object({ appInfo: ImplementationSchema.describe("App identification (name and version)."), appCapabilities: v.describe("Features and capabilities this app provides."), protocolVersion: exports_external2.string().describe("Protocol version this app supports.") }) });
+var k = exports_external2.object({ protocolVersion: exports_external2.string().describe('Negotiated protocol version string (e.g., "2025-11-21").'), hostInfo: ImplementationSchema.describe("Host application identification and version."), hostCapabilities: y.describe("Features and capabilities provided by the host."), hostContext: E.describe("Rich context about the host environment.") }).passthrough();
+var M = "ui/resourceUri";
+var u = "text/html;profile=mcp-app";
+
+class zQ extends j {
   _appInfo;
   _capabilities;
   options;
   _hostCapabilities;
   _hostInfo;
   _hostContext;
+  eventSchemas = { toolinput: A, toolinputpartial: P, toolresult: R, toolcancelled: H, hostcontextchanged: U };
+  onEventDispatch(Z, $) {
+    if (Z === "hostcontextchanged")
+      this._hostContext = { ...this._hostContext, ...$ };
+  }
   constructor(Z, $ = {}, J = { autoResize: true }) {
     super(J);
     this._appInfo = Z;
@@ -27625,7 +27705,7 @@ class qQ extends Protocol {
     this.options = J;
     this.setRequestHandler(PingRequestSchema, (X) => {
       return console.log("Received ping:", X.params), {};
-    }), this.onhostcontextchanged = () => {};
+    }), this.setEventHandler("hostcontextchanged", undefined);
   }
   getHostCapabilities() {
     return this._hostCapabilities;
@@ -27636,31 +27716,68 @@ class qQ extends Protocol {
   getHostContext() {
     return this._hostContext;
   }
+  get ontoolinput() {
+    return this.getEventHandler("toolinput");
+  }
   set ontoolinput(Z) {
-    this.setNotificationHandler(A, ($) => Z($.params));
+    this.setEventHandler("toolinput", Z);
+  }
+  get ontoolinputpartial() {
+    return this.getEventHandler("toolinputpartial");
   }
   set ontoolinputpartial(Z) {
-    this.setNotificationHandler(P, ($) => Z($.params));
+    this.setEventHandler("toolinputpartial", Z);
+  }
+  get ontoolresult() {
+    return this.getEventHandler("toolresult");
   }
   set ontoolresult(Z) {
-    this.setNotificationHandler(U, ($) => Z($.params));
+    this.setEventHandler("toolresult", Z);
+  }
+  get ontoolcancelled() {
+    return this.getEventHandler("toolcancelled");
   }
   set ontoolcancelled(Z) {
-    this.setNotificationHandler(H, ($) => Z($.params));
+    this.setEventHandler("toolcancelled", Z);
+  }
+  get onhostcontextchanged() {
+    return this.getEventHandler("hostcontextchanged");
   }
   set onhostcontextchanged(Z) {
-    this.setNotificationHandler(E, ($) => {
-      this._hostContext = { ...this._hostContext, ...$.params }, Z($.params);
-    });
+    this.setEventHandler("hostcontextchanged", Z);
+  }
+  _onteardown;
+  get onteardown() {
+    return this._onteardown;
   }
   set onteardown(Z) {
-    this.setRequestHandler(_, ($, J) => Z($.params, J));
+    this.warnIfRequestHandlerReplaced("onteardown", this._onteardown, Z), this._onteardown = Z, this.replaceRequestHandler(_, ($, J) => {
+      if (!this._onteardown)
+        throw Error("No onteardown handler set");
+      return this._onteardown($.params, J);
+    });
+  }
+  _oncalltool;
+  get oncalltool() {
+    return this._oncalltool;
   }
   set oncalltool(Z) {
-    this.setRequestHandler(CallToolRequestSchema, ($, J) => Z($.params, J));
+    this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, Z), this._oncalltool = Z, this.replaceRequestHandler(CallToolRequestSchema, ($, J) => {
+      if (!this._oncalltool)
+        throw Error("No oncalltool handler set");
+      return this._oncalltool($.params, J);
+    });
+  }
+  _onlisttools;
+  get onlisttools() {
+    return this._onlisttools;
   }
   set onlisttools(Z) {
-    this.setRequestHandler(ListToolsRequestSchema, ($, J) => Z($.params, J));
+    this.warnIfRequestHandlerReplaced("onlisttools", this._onlisttools, Z), this._onlisttools = Z, this.replaceRequestHandler(ListToolsRequestSchema, ($, J) => {
+      if (!this._onlisttools)
+        throw Error("No onlisttools handler set");
+      return this._onlisttools($.params, J);
+    });
   }
   assertCapabilityForMethod(Z) {}
   assertRequestHandlerCapability(Z) {
@@ -27711,6 +27828,9 @@ class qQ extends Protocol {
   downloadFile(Z, $) {
     return this.request({ method: "ui/download-file", params: Z }, I, $);
   }
+  requestTeardown(Z = {}) {
+    return this.notification({ method: "ui/notifications/request-teardown", params: Z });
+  }
   requestDisplayMode(Z, $) {
     return this.request({ method: "ui/request-display-mode", params: Z }, T, $);
   }
@@ -27723,25 +27843,25 @@ class qQ extends Protocol {
         return;
       Z = true, requestAnimationFrame(() => {
         Z = false;
-        let V = document.documentElement, G = V.style.width, W = V.style.height;
-        V.style.width = "fit-content", V.style.height = "max-content";
-        let M = V.getBoundingClientRect();
-        V.style.width = G, V.style.height = W;
-        let h = window.innerWidth - V.clientWidth, N = Math.ceil(M.width + h), Y = Math.ceil(M.height);
-        if (N !== $ || Y !== J)
-          $ = N, J = Y, this.sendSizeChanged({ width: N, height: Y });
+        let D = document.documentElement, G = D.style.height;
+        D.style.height = "max-content";
+        let L = Math.ceil(D.getBoundingClientRect().height);
+        D.style.height = G;
+        let Y = Math.ceil(window.innerWidth);
+        if (Y !== $ || L !== J)
+          $ = Y, J = L, this.sendSizeChanged({ width: Y, height: L });
       });
     };
     X();
-    let D = new ResizeObserver(X);
-    return D.observe(document.documentElement), D.observe(document.body), () => D.disconnect();
+    let V = new ResizeObserver(X);
+    return V.observe(document.documentElement), V.observe(document.body), () => V.disconnect();
   }
-  async connect(Z = new j(window.parent, window.parent), $) {
+  async connect(Z = new B(window.parent, window.parent), $) {
     if (this.transport)
       throw Error("App is already connected. Call close() before connecting again.");
     await super.connect(Z);
     try {
-      let J = await this.request({ method: "ui/initialize", params: { appCapabilities: this._capabilities, appInfo: this._appInfo, protocolVersion: F } }, R, $);
+      let J = await this.request({ method: "ui/initialize", params: { appCapabilities: this._capabilities, appInfo: this._appInfo, protocolVersion: F } }, k, $);
       if (J === undefined)
         throw Error(`Server sent invalid initialize result: ${J}`);
       if (this._hostCapabilities = J.hostCapabilities, this._hostInfo = J.hostInfo, this._hostContext = J.hostContext, await this.notification({ method: "ui/notifications/initialized" }), this.options?.autoResize)
@@ -27751,16 +27871,16 @@ class qQ extends Protocol {
     }
   }
 }
-function uZ(Z, $, J, X) {
-  let D = J._meta, V = D.ui, G = D[v], W = D;
-  if (V?.resourceUri && !G)
-    W = { ...D, [v]: V.resourceUri };
-  else if (G && !V?.resourceUri)
-    W = { ...D, ui: { ...V, resourceUri: G } };
-  return Z.registerTool($, { ...J, _meta: W }, X);
+function hZ(Z, $, J, X) {
+  let V = J._meta, D = V.ui, G = V[M], L = V;
+  if (D?.resourceUri && !G)
+    L = { ...V, [M]: D.resourceUri };
+  else if (G && !D?.resourceUri)
+    L = { ...V, ui: { ...D, resourceUri: G } };
+  return Z.registerTool($, { ...J, _meta: L }, X);
 }
-function fZ(Z, $, J, X, D) {
-  return Z.registerResource($, J, { mimeType: d, ...X }, D);
+function mZ(Z, $, J, X, V) {
+  return Z.registerResource($, J, { mimeType: u, ...X }, V);
 }
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
@@ -28263,6 +28383,224 @@ var McpZodTypeKind;
   McpZodTypeKind2["Completable"] = "McpCompletable";
 })(McpZodTypeKind || (McpZodTypeKind = {}));
 
+// node_modules/@modelcontextprotocol/sdk/dist/esm/shared/uriTemplate.js
+var MAX_TEMPLATE_LENGTH = 1e6;
+var MAX_VARIABLE_LENGTH = 1e6;
+var MAX_TEMPLATE_EXPRESSIONS = 1e4;
+var MAX_REGEX_LENGTH = 1e6;
+
+class UriTemplate {
+  static isTemplate(str) {
+    return /\{[^}\s]+\}/.test(str);
+  }
+  static validateLength(str, max, context) {
+    if (str.length > max) {
+      throw new Error(`${context} exceeds maximum length of ${max} characters (got ${str.length})`);
+    }
+  }
+  get variableNames() {
+    return this.parts.flatMap((part) => typeof part === "string" ? [] : part.names);
+  }
+  constructor(template) {
+    UriTemplate.validateLength(template, MAX_TEMPLATE_LENGTH, "Template");
+    this.template = template;
+    this.parts = this.parse(template);
+  }
+  toString() {
+    return this.template;
+  }
+  parse(template) {
+    const parts = [];
+    let currentText = "";
+    let i2 = 0;
+    let expressionCount = 0;
+    while (i2 < template.length) {
+      if (template[i2] === "{") {
+        if (currentText) {
+          parts.push(currentText);
+          currentText = "";
+        }
+        const end = template.indexOf("}", i2);
+        if (end === -1)
+          throw new Error("Unclosed template expression");
+        expressionCount++;
+        if (expressionCount > MAX_TEMPLATE_EXPRESSIONS) {
+          throw new Error(`Template contains too many expressions (max ${MAX_TEMPLATE_EXPRESSIONS})`);
+        }
+        const expr = template.slice(i2 + 1, end);
+        const operator = this.getOperator(expr);
+        const exploded = expr.includes("*");
+        const names = this.getNames(expr);
+        const name = names[0];
+        for (const name2 of names) {
+          UriTemplate.validateLength(name2, MAX_VARIABLE_LENGTH, "Variable name");
+        }
+        parts.push({ name, operator, names, exploded });
+        i2 = end + 1;
+      } else {
+        currentText += template[i2];
+        i2++;
+      }
+    }
+    if (currentText) {
+      parts.push(currentText);
+    }
+    return parts;
+  }
+  getOperator(expr) {
+    const operators = ["+", "#", ".", "/", "?", "&"];
+    return operators.find((op) => expr.startsWith(op)) || "";
+  }
+  getNames(expr) {
+    const operator = this.getOperator(expr);
+    return expr.slice(operator.length).split(",").map((name) => name.replace("*", "").trim()).filter((name) => name.length > 0);
+  }
+  encodeValue(value, operator) {
+    UriTemplate.validateLength(value, MAX_VARIABLE_LENGTH, "Variable value");
+    if (operator === "+" || operator === "#") {
+      return encodeURI(value);
+    }
+    return encodeURIComponent(value);
+  }
+  expandPart(part, variables) {
+    if (part.operator === "?" || part.operator === "&") {
+      const pairs = part.names.map((name) => {
+        const value2 = variables[name];
+        if (value2 === undefined)
+          return "";
+        const encoded2 = Array.isArray(value2) ? value2.map((v2) => this.encodeValue(v2, part.operator)).join(",") : this.encodeValue(value2.toString(), part.operator);
+        return `${name}=${encoded2}`;
+      }).filter((pair) => pair.length > 0);
+      if (pairs.length === 0)
+        return "";
+      const separator = part.operator === "?" ? "?" : "&";
+      return separator + pairs.join("&");
+    }
+    if (part.names.length > 1) {
+      const values2 = part.names.map((name) => variables[name]).filter((v2) => v2 !== undefined);
+      if (values2.length === 0)
+        return "";
+      return values2.map((v2) => Array.isArray(v2) ? v2[0] : v2).join(",");
+    }
+    const value = variables[part.name];
+    if (value === undefined)
+      return "";
+    const values = Array.isArray(value) ? value : [value];
+    const encoded = values.map((v2) => this.encodeValue(v2, part.operator));
+    switch (part.operator) {
+      case "":
+        return encoded.join(",");
+      case "+":
+        return encoded.join(",");
+      case "#":
+        return "#" + encoded.join(",");
+      case ".":
+        return "." + encoded.join(".");
+      case "/":
+        return "/" + encoded.join("/");
+      default:
+        return encoded.join(",");
+    }
+  }
+  expand(variables) {
+    let result = "";
+    let hasQueryParam = false;
+    for (const part of this.parts) {
+      if (typeof part === "string") {
+        result += part;
+        continue;
+      }
+      const expanded = this.expandPart(part, variables);
+      if (!expanded)
+        continue;
+      if ((part.operator === "?" || part.operator === "&") && hasQueryParam) {
+        result += expanded.replace("?", "&");
+      } else {
+        result += expanded;
+      }
+      if (part.operator === "?" || part.operator === "&") {
+        hasQueryParam = true;
+      }
+    }
+    return result;
+  }
+  escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  }
+  partToRegExp(part) {
+    const patterns = [];
+    for (const name2 of part.names) {
+      UriTemplate.validateLength(name2, MAX_VARIABLE_LENGTH, "Variable name");
+    }
+    if (part.operator === "?" || part.operator === "&") {
+      for (let i2 = 0;i2 < part.names.length; i2++) {
+        const name2 = part.names[i2];
+        const prefix = i2 === 0 ? "\\" + part.operator : "&";
+        patterns.push({
+          pattern: prefix + this.escapeRegExp(name2) + "=([^&]+)",
+          name: name2
+        });
+      }
+      return patterns;
+    }
+    let pattern;
+    const name = part.name;
+    switch (part.operator) {
+      case "":
+        pattern = part.exploded ? "([^/,]+(?:,[^/,]+)*)" : "([^/,]+)";
+        break;
+      case "+":
+      case "#":
+        pattern = "(.+)";
+        break;
+      case ".":
+        pattern = "\\.([^/,]+)";
+        break;
+      case "/":
+        pattern = "/" + (part.exploded ? "([^/,]+(?:,[^/,]+)*)" : "([^/,]+)");
+        break;
+      default:
+        pattern = "([^/]+)";
+    }
+    patterns.push({ pattern, name });
+    return patterns;
+  }
+  match(uri) {
+    UriTemplate.validateLength(uri, MAX_TEMPLATE_LENGTH, "URI");
+    let pattern = "^";
+    const names = [];
+    for (const part of this.parts) {
+      if (typeof part === "string") {
+        pattern += this.escapeRegExp(part);
+      } else {
+        const patterns = this.partToRegExp(part);
+        for (const { pattern: partPattern, name } of patterns) {
+          pattern += partPattern;
+          names.push({ name, exploded: part.exploded });
+        }
+      }
+    }
+    pattern += "$";
+    UriTemplate.validateLength(pattern, MAX_REGEX_LENGTH, "Generated regex pattern");
+    const regex = new RegExp(pattern);
+    const match = uri.match(regex);
+    if (!match)
+      return null;
+    const result = {};
+    for (let i2 = 0;i2 < names.length; i2++) {
+      const { name, exploded } = names[i2];
+      const value = match[i2 + 1];
+      const cleanName = name.replace("*", "");
+      if (exploded && value.includes(",")) {
+        result[cleanName] = value.split(",");
+      } else {
+        result[cleanName] = value;
+      }
+    }
+    return result;
+  }
+}
+
 // node_modules/@modelcontextprotocol/sdk/dist/esm/shared/toolNameValidation.js
 var TOOL_NAME_REGEX = /^[A-Za-z0-9._-]{1,128}$/;
 function validateToolName(name) {
@@ -28920,6 +29258,9 @@ class McpServer {
           annotations = rest.shift();
         }
       } else if (typeof firstArg === "object" && firstArg !== null) {
+        if (Object.values(firstArg).some((v2) => typeof v2 === "object" && v2 !== null)) {
+          throw new Error(`Tool ${name} expected a Zod schema or ToolAnnotations, but received an unrecognized object`);
+        }
         annotations = rest.shift();
       }
     }
@@ -28983,6 +29324,22 @@ class McpServer {
     }
   }
 }
+
+class ResourceTemplate {
+  constructor(uriTemplate, _callbacks) {
+    this._callbacks = _callbacks;
+    this._uriTemplate = typeof uriTemplate === "string" ? new UriTemplate(uriTemplate) : uriTemplate;
+  }
+  get uriTemplate() {
+    return this._uriTemplate;
+  }
+  get listCallback() {
+    return this._callbacks.list;
+  }
+  completeCallback(variable) {
+    return this._callbacks.complete?.[variable];
+  }
+}
 var EMPTY_OBJECT_JSON_SCHEMA = {
   type: "object",
   properties: {}
@@ -29012,6 +29369,9 @@ function getZodSchemaObject(schema) {
   if (isZodRawShapeCompat(schema)) {
     return objectFromShape(schema);
   }
+  if (!isZodSchemaInstance(schema)) {
+    throw new Error("inputSchema must be a Zod schema or raw shape, received an unrecognized object");
+  }
   return schema;
 }
 function promptArgumentsFromSchema(schema) {
@@ -29061,13 +29421,83 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-// src/tools/build-chart.ts
-function isMcpAppEnabled() {
-  return process.env.TOOL_CHART_BUILDER_MCP_APP_ENABLED !== "false" && process.env.TOOL_CHART_BUILDER_MCP_APP_ENABLED !== "0";
+// src/utils/sisense-session.ts
+var MISSING_SISENSE_SESSION_MESSAGE = "Sisense credentials not found in this session. Provide sisenseUrl and sisenseToken as URL query parameters when connecting, or set SISENSE_URL and SISENSE_TOKEN in the server environment.";
+var MISSING_BASE_URL_SESSION_MESSAGE = "Base URL not found in session.";
+function getSessionHttpClient(sessionState) {
+  const client = sessionState?.get("httpClient");
+  if (!client) {
+    throw new Error(MISSING_SISENSE_SESSION_MESSAGE);
+  }
+  return client;
+}
+function getSessionOpenAIClient(sessionState) {
+  const client = sessionState?.get("openAIClient");
+  if (!client) {
+    throw new Error(MISSING_SISENSE_SESSION_MESSAGE);
+  }
+  return client;
+}
+function getSessionSisenseUrl(sessionState) {
+  const url2 = sessionState?.get("sisenseUrl");
+  if (!url2) {
+    throw new Error(MISSING_SISENSE_SESSION_MESSAGE);
+  }
+  return url2;
+}
+function getSessionSisenseToken(sessionState) {
+  const token = sessionState?.get("sisenseToken");
+  if (!token) {
+    throw new Error(MISSING_SISENSE_SESSION_MESSAGE);
+  }
+  return token;
+}
+function getSessionBaseUrl(sessionState) {
+  const baseUrl = sessionState?.get("baseUrl");
+  if (!baseUrl) {
+    throw new Error(MISSING_BASE_URL_SESSION_MESSAGE);
+  }
+  return baseUrl;
+}
+
+// src/utils/feature-flags.ts
+function parseBooleanParam(value) {
+  if (value === null)
+    return null;
+  const trimmed = value.trim().toLowerCase();
+  if (trimmed === "true" || trimmed === "1")
+    return true;
+  if (trimmed === "false" || trimmed === "0")
+    return false;
+  return null;
+}
+function resolveFeatureFlagsFromEnv() {
+  return {
+    mcpAppEnabled: process.env.MCP_APP_ENABLED !== "false" && process.env.MCP_APP_ENABLED !== "0",
+    toolBuildQueryEnabled: process.env.TOOL_BUILD_QUERY_ENABLED === "true" || process.env.TOOL_BUILD_QUERY_ENABLED === "1",
+    toolBuildChartNarrativeEnabled: process.env.TOOL_BUILD_CHART_NARRATIVE_ENABLED !== "false" && process.env.TOOL_BUILD_CHART_NARRATIVE_ENABLED !== "0"
+  };
 }
-function isNarrativeEnabled() {
-  return process.env.TOOL_CHART_BUILDER_NARRATIVE_ENABLED !== "false" && process.env.TOOL_CHART_BUILDER_NARRATIVE_ENABLED !== "0";
+function resolveFeatureFlagsFromUrl(url2) {
+  const env = resolveFeatureFlagsFromEnv();
+  return {
+    mcpAppEnabled: parseBooleanParam(url2.searchParams.get("mcpAppEnabled")) ?? env.mcpAppEnabled,
+    toolBuildQueryEnabled: parseBooleanParam(url2.searchParams.get("toolBuildQueryEnabled")) ?? env.toolBuildQueryEnabled,
+    toolBuildChartNarrativeEnabled: parseBooleanParam(url2.searchParams.get("toolBuildChartNarrativeEnabled")) ?? env.toolBuildChartNarrativeEnabled
+  };
 }
+function applyFeatureFlagsToSession(url2, state) {
+  state.set("featureFlags", resolveFeatureFlagsFromUrl(url2));
+}
+function getFeatureFlags(sessionState) {
+  const stored = sessionState?.get("featureFlags");
+  if (stored != null) {
+    return stored;
+  }
+  return resolveFeatureFlagsFromEnv();
+}
+
+// src/tools/build-chart.ts
 var baseOutputSchema = exports_external.object({
   success: exports_external.boolean(),
   chartId: exports_external.string().optional(),
@@ -29078,8 +29508,8 @@ var buildChartOutputSchemaAppMode = baseOutputSchema;
 var buildChartOutputSchemaToolMode = baseOutputSchema.extend({
   imageUrl: exports_external.string().optional()
 });
-function getBuildChartOutputSchema() {
-  return isMcpAppEnabled() ? buildChartOutputSchemaAppMode : buildChartOutputSchemaToolMode;
+function getBuildChartOutputSchema(flags) {
+  return flags.mcpAppEnabled ? buildChartOutputSchemaAppMode : buildChartOutputSchemaToolMode;
 }
 function getChartSummaries(sessionState) {
   return sessionState?.get("chart:summaries") ?? [];
@@ -29089,46 +29519,43 @@ function addChartSummary(sessionState, summary) {
   summaries.push(summary);
   sessionState?.set("chart:summaries", summaries);
 }
-async function buildChart(args, sessionState, requestId) {
+async function buildChart(args, sessionState) {
+  const { mcpAppEnabled, toolBuildChartNarrativeEnabled } = getFeatureFlags(sessionState);
   try {
-    const { dataSourceTitle, userPrompt } = args;
-    const toolCallId = String(requestId ? `chart-${requestId}` : `chart-${Date.now()}`);
+    const { dataSourceTitle, userPrompt, queryId } = args;
+    const httpClient = getSessionHttpClient(sessionState);
+    const openAIClient = getSessionOpenAIClient(sessionState);
+    const toolCallId = generateArtifactId("chart");
     const result = await csdkBrowserMock.withBrowserEnvironment(async () => {
-      const { buildChartEngine, runWithUserAction } = await import("./index-c0zk3ctc.js");
-      const { renderChartWidget } = await import("./widget-renderer-56n3m26y.js");
+      const { buildChartEngine, runWithUserAction } = await import("./index-xxces5vh.js");
+      const { renderChartWidget } = await import("./widget-renderer-hynpvfm9.js");
       const buildChartContext = {
         toolCallId,
         dataSourceTitle,
         chartSummaries: getChartSummaries(sessionState),
         retrieveChart: (id) => sessionState?.get(id) ?? null,
         saveChart: (id, props) => sessionState?.set(id, props),
+        retrieveQuery: (id) => sessionState?.get(`query-${id}`) ?? null,
+        onInternalQueryResult: (result2) => sessionState?.set(`query-${result2.queryId}`, result2),
         isNlqV3Enabled: true,
-        httpClient: sessionState?.get("httpClient"),
-        openAIClient: sessionState?.get("openAIClient")
+        httpClient,
+        openAIClient,
+        ...queryId != null && { queryId }
       };
-      const chartSummary2 = await runWithUserAction("MCP", "ASSISTANT", () => buildChartEngine({ dataSourceTitle, userPrompt }, buildChartContext));
+      const chartSummary2 = await runWithUserAction("MCP", "ASSISTANT", () => buildChartEngine({ dataSourceTitle, userPrompt, queryId: queryId ?? undefined }, buildChartContext));
       console.info(">>> CHART SUMMARY", chartSummary2);
       addChartSummary(sessionState, chartSummary2);
       const savedProps = sessionState?.get(chartSummary2.chartId);
       if (savedProps) {
-        const sisenseUrl2 = sessionState?.get("sisenseUrl");
-        const sisenseToken2 = sessionState?.get("sisenseToken");
-        const baseUrl = sessionState?.get("baseUrl");
-        const httpClient = sessionState?.get("httpClient");
-        if (!sisenseUrl2 || !sisenseToken2) {
-          throw new Error("Sisense credentials not found in session. Provide sisenseUrl and sisenseToken as URL params.");
-        }
-        if (!baseUrl) {
-          throw new Error("Base URL not found in session.");
-        }
-        const narrativeEnabled = isNarrativeEnabled();
-        const { getNlgInsightsFromWidget } = await import("./ai-3wz11tv8.js");
-        const insightsPromise = narrativeEnabled && httpClient ? getNlgInsightsFromWidget(savedProps, httpClient, { verbosity: "High" }) : Promise.resolve(undefined);
-        const renderPromise = isMcpAppEnabled() ? Promise.resolve(null) : renderChartWidget({
+        const sisenseUrl = getSessionSisenseUrl(sessionState);
+        const sisenseToken = getSessionSisenseToken(sessionState);
+        const { getNlgInsightsFromWidget } = await import("./ai-w2gkxdn7.js");
+        const insightsPromise = toolBuildChartNarrativeEnabled && httpClient ? getNlgInsightsFromWidget(savedProps, httpClient, { verbosity: "High" }) : Promise.resolve(undefined);
+        const renderPromise = mcpAppEnabled ? Promise.resolve(null) : renderChartWidget({
           widgetProps: savedProps,
-          sisenseUrl: sisenseUrl2,
-          sisenseToken: sisenseToken2,
-          baseUrl
+          sisenseUrl,
+          sisenseToken,
+          baseUrl: getSessionBaseUrl(sessionState)
         });
         const [insightsResult, renderResult] = await Promise.allSettled([
           insightsPromise,
@@ -29142,19 +29569,27 @@ async function buildChart(args, sessionState, requestId) {
           console.warn("Failed to generate NLG insights:", sanitized.message);
         }
         let imageUrl2;
-        if (!isMcpAppEnabled() && renderResult.status === "fulfilled" && renderResult.value) {
+        if (!mcpAppEnabled && renderResult.status === "fulfilled" && renderResult.value) {
           imageUrl2 = renderResult.value.content[0]?.text;
-        } else if (!isMcpAppEnabled() && renderResult.status === "rejected") {
+        } else if (!mcpAppEnabled && renderResult.status === "rejected") {
           const sanitized = sanitizeError(renderResult.reason);
           console.warn("Failed to render chart widget:", sanitized.message);
         }
+        const serializedWidgetProps = ni.serialize(savedProps);
+        if (mcpAppEnabled && sisenseUrl && sisenseToken) {
+          sessionState?.set(`chart:payload:${chartSummary2.chartId}`, {
+            sisenseUrl,
+            sisenseToken,
+            serializedWidgetProps
+          });
+        }
         return {
           chartSummary: chartSummary2,
           imageUrl: imageUrl2,
           insights: insights2,
-          sisenseUrl: sisenseUrl2,
-          sisenseToken: sisenseToken2,
-          serializedWidgetProps: Kn.serialize(savedProps)
+          sisenseUrl,
+          sisenseToken,
+          serializedWidgetProps
         };
       }
       console.warn("No saved props found for chartId:", chartSummary2.chartId);
@@ -29166,13 +29601,13 @@ async function buildChart(args, sessionState, requestId) {
         sisenseToken: undefined
       };
     });
-    const { chartSummary, imageUrl, insights, sisenseUrl, sisenseToken, serializedWidgetProps } = result;
+    const { chartSummary, imageUrl, insights } = result;
     const output = {
       success: true,
       chartId: chartSummary.chartId,
       message: chartSummary.message || `Chart created successfully for query: "${userPrompt}"`,
-      ...isNarrativeEnabled() && insights != null ? { insights } : {},
-      ...isMcpAppEnabled() ? {} : { imageUrl }
+      ...toolBuildChartNarrativeEnabled && insights != null ? { insights } : {},
+      ...mcpAppEnabled ? {} : { imageUrl }
     };
     const finalOutput = {
       content: [
@@ -29181,14 +29616,7 @@ async function buildChart(args, sessionState, requestId) {
           text: JSON.stringify(output, null, 2)
         }
       ],
-      structuredContent: output,
-      ...isMcpAppEnabled() ? {
-        _meta: {
-          sisenseUrl,
-          sisenseToken,
-          serializedWidgetProps
-        }
-      } : {}
+      structuredContent: output
     };
     return finalOutput;
   } catch (error40) {
@@ -29197,8 +29625,8 @@ async function buildChart(args, sessionState, requestId) {
       success: false,
       chartId: undefined,
       message: `Failed to create chart: ${errorMessage}`,
-      ...isNarrativeEnabled() ? { insights: undefined } : {},
-      ...isMcpAppEnabled() ? {} : { imageUrl: undefined }
+      ...toolBuildChartNarrativeEnabled ? { insights: undefined } : {},
+      ...mcpAppEnabled ? {} : { imageUrl: undefined }
     };
     return {
       content: [
@@ -29213,16 +29641,66 @@ async function buildChart(args, sessionState, requestId) {
   }
 }
 
+// src/tools/build-query.ts
+var buildQueryOutputSchema = exports_external.object({
+  success: exports_external.boolean(),
+  queryId: exports_external.string().optional(),
+  title: exports_external.string().optional(),
+  message: exports_external.string(),
+  dataset: exports_external.unknown().optional()
+});
+async function buildQuery(args, sessionState) {
+  try {
+    const { dataSourceTitle, queryPrompt } = args;
+    const httpClient = getSessionHttpClient(sessionState);
+    const toolCallId = generateArtifactId("query");
+    const { queryId, title, dataset } = await csdkBrowserMock.withBrowserEnvironment(async () => {
+      const { buildQueryEngine, toQuerySummary, runWithUserAction } = await import("./index-xxces5vh.js");
+      const queryResult = await runWithUserAction("MCP", "ASSISTANT", () => buildQueryEngine({ dataSourceTitle, queryPrompt }, { toolCallId, httpClient }));
+      sessionState?.set(`query-${queryResult.queryId}`, queryResult);
+      const summary = toQuerySummary(queryResult, true);
+      return { queryId: summary.queryId, title: summary.title, dataset: summary.dataset };
+    });
+    const output = {
+      success: true,
+      queryId,
+      title,
+      message: `Query executed successfully for: "${queryPrompt}"`,
+      dataset
+    };
+    return {
+      content: [{ type: "text", text: JSON.stringify(output, null, 2) }],
+      structuredContent: output
+    };
+  } catch (error40) {
+    const sanitized = sanitizeError(error40, true);
+    console.error("buildQuery failed:", sanitized.message);
+    if (sanitized.stack) {
+      console.error(sanitized.stack);
+    }
+    const output = {
+      success: false,
+      message: `Failed to execute query: ${sanitized.message}`
+    };
+    return {
+      content: [{ type: "text", text: JSON.stringify(output, null, 2) }],
+      structuredContent: output,
+      isError: true
+    };
+  }
+}
+
 // src/tools/get-data-sources.ts
 var getDataSourcesOutputSchema = {
   dataSources: exports_external.array(exports_external.any())
 };
 async function getDataSources(_args, sessionState) {
   try {
-    const { getDataSourcesEngine } = await import("./index-c0zk3ctc.js");
+    const httpClient = getSessionHttpClient(sessionState);
+    const { getDataSourcesEngine } = await import("./index-xxces5vh.js");
     const getDataSourcesContext = {
       toolCallId: "get-data-sources",
-      httpClient: sessionState?.get("httpClient")
+      httpClient
     };
     const result = await getDataSourcesEngine({}, getDataSourcesContext);
     return {
@@ -29262,10 +29740,11 @@ var getDataSourceFieldsOutputSchema = {
 async function getDataSourceFields(args, sessionState) {
   const { dataSourceTitle } = args;
   try {
-    const { getDataSourceFieldsEngine } = await import("./index-c0zk3ctc.js");
+    const httpClient = getSessionHttpClient(sessionState);
+    const { getDataSourceFieldsEngine } = await import("./index-xxces5vh.js");
     const getDataSourceFieldsContext = {
       toolCallId: "get-data-source-fields",
-      httpClient: sessionState?.get("httpClient")
+      httpClient
     };
     const result = await getDataSourceFieldsEngine({ dataSourceTitle }, getDataSourceFieldsContext);
     return {
@@ -29531,9 +30010,6 @@ var __dirname2 = path.dirname(fileURLToPath(import.meta.url));
 var isSource = import.meta.url.endsWith(".ts");
 var DIST_DIR = isSource ? path.join(__dirname2, "..", "dist") : __dirname2;
 var ANALYTICS_RESOURCE_URI = "ui://sisense-analytics/view.html";
-function isMcpAppEnabled2() {
-  return process.env.TOOL_CHART_BUILDER_MCP_APP_ENABLED !== "false" && process.env.TOOL_CHART_BUILDER_MCP_APP_ENABLED !== "0";
-}
 function getCspMeta(sessionState) {
   const sisenseUrl = sessionState?.get("sisenseUrl")?.trim() ?? process.env.SISENSE_URL?.trim();
   const connectDomains = sisenseUrl ? [sisenseUrl] : [];
@@ -29552,14 +30028,18 @@ var noOpValidator = {
 };
 async function setupMcpServer(sessionState) {
   try {
+    const { mcpAppEnabled, toolBuildQueryEnabled } = getFeatureFlags(sessionState);
     const {
       TOOL_NAME_CHART_BUILDER,
+      TOOL_NAME_BUILD_QUERY,
       TOOL_NAME_GET_DATA_SOURCE_FIELDS,
       TOOL_NAME_GET_DATA_SOURCES,
       getDataSourcesSchema,
       getDataSourceFieldsSchema,
-      buildChartSchema
-    } = await import("./index-c0zk3ctc.js");
+      buildChartSchema,
+      buildChartSchemaNaturalConversation,
+      buildQuerySchema
+    } = await import("./index-xxces5vh.js");
     const server = new McpServer({
       name: "sisense-mcp-server",
       version: "1.0.0"
@@ -29582,35 +30062,46 @@ async function setupMcpServer(sessionState) {
     }, async (args) => {
       return await getDataSourceFields(args, sessionState);
     });
-    const buildChartOutputSchema = getBuildChartOutputSchema();
-    if (isMcpAppEnabled2()) {
-      uZ(server, TOOL_NAME_CHART_BUILDER, {
+    if (toolBuildQueryEnabled) {
+      server.registerTool(TOOL_NAME_BUILD_QUERY, {
+        title: "Execute Sisense Analytics Query",
+        description: "Converts a natural language question into an analytics query for a Sisense data source, executes it, and returns the resulting dataset and a queryId. Use the queryId when calling buildChart to visualize the results without re-running the query.",
+        inputSchema: buildQuerySchema.shape,
+        outputSchema: buildQueryOutputSchema.shape
+      }, async (args) => {
+        return await buildQuery(args, sessionState);
+      });
+    }
+    const buildChartOutputSchema = getBuildChartOutputSchema(getFeatureFlags(sessionState));
+    const chartInputSchema = toolBuildQueryEnabled ? buildChartSchemaNaturalConversation : buildChartSchema;
+    if (mcpAppEnabled) {
+      hZ(server, TOOL_NAME_CHART_BUILDER, {
         title: "Build Sisense Chart from User Prompt",
         description: "Build a chart from a Sisense data source using natural language user prompt. Chart type will be automatically determined by Sisense AI based on the user prompt.",
-        inputSchema: buildChartSchema.shape,
+        inputSchema: chartInputSchema.shape,
         outputSchema: buildChartOutputSchema.shape,
         _meta: { ui: { resourceUri: ANALYTICS_RESOURCE_URI } }
-      }, async (args, extra) => {
-        return await buildChart(args, sessionState, extra.requestId);
+      }, async (args) => {
+        return await buildChart(args, sessionState);
       });
     } else {
       server.registerTool(TOOL_NAME_CHART_BUILDER, {
         title: "Build Sisense Chart from User Prompt",
         description: "Build a chart from a Sisense data source using natural language user prompt. Chart type will be automatically determined by Sisense AI based on the user prompt.",
-        inputSchema: buildChartSchema.shape,
+        inputSchema: chartInputSchema.shape,
         outputSchema: buildChartOutputSchema.shape
       }, async (args) => {
         return await buildChart(args, sessionState);
       });
     }
-    fZ(server, ANALYTICS_RESOURCE_URI, ANALYTICS_RESOURCE_URI, { mimeType: d }, async () => {
+    mZ(server, ANALYTICS_RESOURCE_URI, ANALYTICS_RESOURCE_URI, { mimeType: u }, async () => {
       const html = await readFile(path.join(DIST_DIR, "view.html"), "utf-8");
       const meta = getCspMeta(sessionState);
       return {
         contents: [
           {
             uri: ANALYTICS_RESOURCE_URI,
-            mimeType: d,
+            mimeType: u,
             text: html,
             _meta: meta
           }
@@ -29618,6 +30109,22 @@ async function setupMcpServer(sessionState) {
       };
     });
     registerPrompts(server);
+    server.registerResource("chart-data", new ResourceTemplate("ui://sisense-analytics/chart/{chartId}", { list: undefined }), { mimeType: "application/json" }, async (uri, vars) => {
+      const chartId = String(vars.chartId);
+      const payload = sessionState?.get(`chart:payload:${chartId}`);
+      if (!payload) {
+        throw new Error(`Chart data not found for chartId: ${chartId}`);
+      }
+      return {
+        contents: [
+          {
+            uri: uri.href,
+            mimeType: "application/json",
+            text: JSON.stringify(payload)
+          }
+        ]
+      };
+    });
     return server;
   } catch (error40) {
     console.error("Error setting up MCP server:", error40);
@@ -29644,6 +30151,18 @@ var persistentStates = new Map;
 function getCredentialKey(sisenseUrl, sisenseToken) {
   return createHash("sha256").update(`${sisenseUrl}:${sisenseToken}`).digest("hex").slice(0, 16);
 }
+function resetConversationState(existingState, req) {
+  const freshState = new Map(existingState);
+  for (const key of freshState.keys()) {
+    if (key === "chart:summaries" || typeof key === "string" && (key.startsWith("chart-") || key.startsWith("query-"))) {
+      freshState.delete(key);
+    }
+  }
+  const protocol = req.headers["x-forwarded-proto"] || "http";
+  const host = req.headers["x-forwarded-host"] || req.headers.host;
+  freshState.set("baseUrl", `${protocol}://${host}`);
+  return freshState;
+}
 var server = createServer(async (req, res) => {
   const url2 = new URL(req.url || "/", `http://${req.headers.host}`);
   if (url2.pathname === "/health" && req.method === "GET") {
@@ -29736,7 +30255,8 @@ var server = createServer(async (req, res) => {
           const credKey = getCredentialKey(sisenseUrl, sisenseToken);
           const existingState = persistentStates.get(credKey);
           if (existingState) {
-            state = existingState;
+            state = resetConversationState(existingState, req);
+            persistentStates.set(credKey, state);
           } else {
             try {
               const validatedUrl = validateUrl(sisenseUrl, {
@@ -29759,7 +30279,7 @@ var server = createServer(async (req, res) => {
                 createOpenAIClient,
                 initializeHttpClient,
                 initializeOpenAIClient
-              } = await import("./index-c0zk3ctc.js");
+              } = await import("./index-xxces5vh.js");
               const httpClient = createHttpClientFromConfig({
                 url: validatedUrl,
                 token: validatedToken
@@ -29804,6 +30324,7 @@ var server = createServer(async (req, res) => {
             sessions.delete(transport.sessionId);
           }
         };
+        applyFeatureFlagsToSession(url2, state);
         const mcpServer = await setupMcpServer(state);
         await mcpServer.connect(transport);
       } else {
@@ -29854,6 +30375,9 @@ initializeSisenseClients().then(() => {
     console.log(`  http://localhost:${PORT}/mcp?sisenseUrl=<SISENSE_URL>&sisenseToken=<SISENSE_TOKEN>`);
     console.log("  Or set SISENSE_URL and SISENSE_TOKEN in the environment and use http://localhost:" + `${PORT}/mcp`);
     console.log("");
+    console.log("Optional feature-flag query params (override env vars per connection):");
+    console.log("  mcpAppEnabled=true|false, toolBuildQueryEnabled=true|false, toolBuildChartNarrativeEnabled=true|false");
+    console.log("");
     console.log("Endpoints:");
     console.log(`  Health: http://localhost:${PORT}/health`);
     console.log(`  Screenshots: http://localhost:${PORT}/screenshots/`);