@s2-dev/streamstore 0.14.0 → 0.15.1

package/bin/mcp-server.js

@@ -34265,9 +34265,9 @@ var init_config = __esm(() => {
   SDK_METADATA = {
     language: "typescript",
     openapiDocVersion: "1.0.0",
-    sdkVersion: "0.14.0",
-    genVersion: "2.610.0",
-    userAgent: "speakeasy-sdk/typescript 0.14.0 2.610.0 1.0.0 @s2-dev/streamstore"
+    sdkVersion: "0.15.1",
+    genVersion: "2.624.0",
+    userAgent: "speakeasy-sdk/typescript 0.15.1 2.624.0 1.0.0 @s2-dev/streamstore"
   };
 });
 
@@ -34832,7 +34832,6 @@ class ClientSDK {
     } else {
       this.#hooks = new SDKHooks;
     }
-    this._options = { ...options, hooks: this.#hooks };
     const url = serverURLFromOptions(options);
     if (url) {
       url.pathname = url.pathname.replace(/\/+$/, "") + "/";
@@ -34843,7 +34842,8 @@ class ClientSDK {
     });
     this._baseURL = baseURL;
     this.#httpClient = client;
-    this.#logger = options.debugLogger;
+    this._options = { ...options, hooks: this.#hooks };
+    this.#logger = this._options.debugLogger;
     if (!this.#logger && env().S2_DEBUG) {
       this.#logger = console;
     }
@@ -34897,7 +34897,7 @@ class ClientSDK {
       headers.set(k2, v2);
     }
     if (!isBrowserLike) {
-      headers.set(conf.uaHeader ?? "user-agent", SDK_METADATA.userAgent);
+      headers.set(conf.uaHeader ?? "user-agent", conf.userAgent ?? SDK_METADATA.userAgent);
     }
     const fetchOptions = {
       ...options?.fetchOptions,
@@ -35247,29 +35247,168 @@ var init_tools = __esm(() => {
   init_shared();
 });
 
+// src/models/errors/s2error.ts
+var S2Error;
+var init_s2error = __esm(() => {
+  S2Error = class S2Error extends Error {
+    statusCode;
+    body;
+    headers;
+    contentType;
+    rawResponse;
+    constructor(message, httpMeta) {
+      super(message);
+      this.statusCode = httpMeta.response.status;
+      this.body = httpMeta.body;
+      this.headers = httpMeta.response.headers;
+      this.contentType = httpMeta.response.headers.get("content-type") || "";
+      this.rawResponse = httpMeta.response;
+      this.name = "S2Error";
+    }
+  };
+});
+
 // src/models/errors/apierror.ts
 var APIError;
 var init_apierror = __esm(() => {
-  APIError = class APIError extends Error {
-    rawResponse;
-    body;
-    statusCode;
-    contentType;
-    constructor(message, rawResponse, body = "") {
-      const statusCode = rawResponse.status;
-      const contentType2 = rawResponse.headers.get("content-type") || "";
-      const bodyString = body.length > 0 ? `
-${body}` : "";
-      super(`${message}: Status ${statusCode} Content-Type ${contentType2} Body ${bodyString}`);
-      this.rawResponse = rawResponse;
-      this.body = body;
-      this.statusCode = statusCode;
-      this.contentType = contentType2;
+  init_s2error();
+  APIError = class APIError extends S2Error {
+    constructor(message, httpMeta) {
+      if (message) {
+        message += `: `;
+      }
+      message += `Status ${httpMeta.response.status}`;
+      const contentType2 = httpMeta.response.headers.get("content-type") || `""`;
+      if (contentType2 !== "application/json") {
+        message += ` Content-Type ${contentType2.includes(" ") ? `"${contentType2}"` : contentType2}`;
+      }
+      const body = httpMeta.body || `""`;
+      message += body.length > 100 ? `
+` : " ";
+      message += `Body ${body}`;
+      message = message.trim();
+      super(message, httpMeta);
       this.name = "APIError";
     }
   };
 });
 
+// src/models/errors/sdkvalidationerror.ts
+function formatZodError(err, level = 0) {
+  let pre = "  ".repeat(level);
+  pre = level > 0 ? `│${pre}` : pre;
+  pre += " ".repeat(level);
+  let message = "";
+  const append = (str) => message += `
+${pre}${str}`;
+  const len = err.issues.length;
+  const headline = len === 1 ? `${len} issue found` : `${len} issues found`;
+  if (len) {
+    append(`┌ ${headline}:`);
+  }
+  for (const issue of err.issues) {
+    let path = issue.path.join(".");
+    path = path ? `<root>.${path}` : "<root>";
+    append(`│ • [${path}]: ${issue.message} (${issue.code})`);
+    switch (issue.code) {
+      case "invalid_literal":
+      case "invalid_type": {
+        append(`│     Want: ${issue.expected}`);
+        append(`│      Got: ${issue.received}`);
+        break;
+      }
+      case "unrecognized_keys": {
+        append(`│     Keys: ${issue.keys.join(", ")}`);
+        break;
+      }
+      case "invalid_enum_value": {
+        append(`│     Allowed: ${issue.options.join(", ")}`);
+        append(`│         Got: ${issue.received}`);
+        break;
+      }
+      case "invalid_union_discriminator": {
+        append(`│     Allowed: ${issue.options.join(", ")}`);
+        break;
+      }
+      case "invalid_union": {
+        const len2 = issue.unionErrors.length;
+        append(`│   ✖︎ Attemped to deserialize into one of ${len2} union members:`);
+        issue.unionErrors.forEach((err2, i) => {
+          append(`│   ✖︎ Member ${i + 1} of ${len2}`);
+          append(`${formatZodError(err2, level + 1)}`);
+        });
+      }
+    }
+  }
+  if (err.issues.length) {
+    append(`└─*`);
+  }
+  return message.slice(1);
+}
+var SDKValidationError;
+var init_sdkvalidationerror = __esm(() => {
+  init_esm();
+  SDKValidationError = class SDKValidationError extends Error {
+    rawValue;
+    rawMessage;
+    static [Symbol.hasInstance](instance) {
+      if (!(instance instanceof Error))
+        return false;
+      if (!("rawValue" in instance))
+        return false;
+      if (!("rawMessage" in instance))
+        return false;
+      if (!("pretty" in instance))
+        return false;
+      if (typeof instance.pretty !== "function")
+        return false;
+      return true;
+    }
+    constructor(message, cause, rawValue) {
+      super(`${message}: ${cause}`);
+      this.name = "SDKValidationError";
+      this.cause = cause;
+      this.rawValue = rawValue;
+      this.rawMessage = message;
+    }
+    pretty() {
+      if (this.cause instanceof ZodError) {
+        return `${this.rawMessage}
+${formatZodError(this.cause)}`;
+      } else {
+        return this.toString();
+      }
+    }
+  };
+});
+
+// src/models/errors/responsevalidationerror.ts
+var ResponseValidationError;
+var init_responsevalidationerror = __esm(() => {
+  init_esm();
+  init_s2error();
+  init_sdkvalidationerror();
+  ResponseValidationError = class ResponseValidationError extends S2Error {
+    rawValue;
+    rawMessage;
+    constructor(message, extra) {
+      super(message, extra);
+      this.name = "ResponseValidationError";
+      this.cause = extra.cause;
+      this.rawValue = extra.rawValue;
+      this.rawMessage = extra.rawMessage;
+    }
+    pretty() {
+      if (this.cause instanceof ZodError) {
+        return `${this.rawMessage}
+${formatZodError(this.cause)}`;
+      } else {
+        return this.toString();
+      }
+    }
+  };
+});
+
 // src/lib/event-streams.ts
 function findBoundary(buffer, start) {
   const char1 = buffer[start];
@@ -35472,94 +35611,6 @@ var init_event_streams = __esm(() => {
   };
 });
 
-// src/models/errors/sdkvalidationerror.ts
-function formatZodError(err, level = 0) {
-  let pre = "  ".repeat(level);
-  pre = level > 0 ? `│${pre}` : pre;
-  pre += " ".repeat(level);
-  let message = "";
-  const append = (str) => message += `
-${pre}${str}`;
-  const len = err.issues.length;
-  const headline = len === 1 ? `${len} issue found` : `${len} issues found`;
-  if (len) {
-    append(`┌ ${headline}:`);
-  }
-  for (const issue of err.issues) {
-    let path = issue.path.join(".");
-    path = path ? `<root>.${path}` : "<root>";
-    append(`│ • [${path}]: ${issue.message} (${issue.code})`);
-    switch (issue.code) {
-      case "invalid_literal":
-      case "invalid_type": {
-        append(`│     Want: ${issue.expected}`);
-        append(`│      Got: ${issue.received}`);
-        break;
-      }
-      case "unrecognized_keys": {
-        append(`│     Keys: ${issue.keys.join(", ")}`);
-        break;
-      }
-      case "invalid_enum_value": {
-        append(`│     Allowed: ${issue.options.join(", ")}`);
-        append(`│         Got: ${issue.received}`);
-        break;
-      }
-      case "invalid_union_discriminator": {
-        append(`│     Allowed: ${issue.options.join(", ")}`);
-        break;
-      }
-      case "invalid_union": {
-        const len2 = issue.unionErrors.length;
-        append(`│   ✖︎ Attemped to deserialize into one of ${len2} union members:`);
-        issue.unionErrors.forEach((err2, i) => {
-          append(`│   ✖︎ Member ${i + 1} of ${len2}`);
-          append(`${formatZodError(err2, level + 1)}`);
-        });
-      }
-    }
-  }
-  if (err.issues.length) {
-    append(`└─*`);
-  }
-  return message.slice(1);
-}
-var SDKValidationError;
-var init_sdkvalidationerror = __esm(() => {
-  init_esm();
-  SDKValidationError = class SDKValidationError extends Error {
-    rawValue;
-    rawMessage;
-    constructor(message, cause, rawValue) {
-      super(`${message}: ${cause}`);
-      this.name = "SDKValidationError";
-      this.cause = cause;
-      this.rawValue = rawValue;
-      this.rawMessage = message;
-    }
-    pretty() {
-      if (this.cause instanceof ZodError) {
-        return `${this.rawMessage}
-${formatZodError(this.cause)}`;
-      } else {
-        return this.toString();
-      }
-    }
-  };
-});
-
-// src/lib/schemas.ts
-function safeParse(rawValue, fn, errorMessage) {
-  try {
-    return OK2(fn(rawValue));
-  } catch (err) {
-    return ERR(new SDKValidationError(errorMessage, err, rawValue));
-  }
-}
-var init_schemas = __esm(() => {
-  init_sdkvalidationerror();
-});
-
 // src/lib/matchers.ts
 function jsonErr(codes, schema, options) {
   return { ...options, err: true, enc: "json", codes, schema };
@@ -35577,7 +35628,7 @@ function fail(codes) {
   return { enc: "fail", codes };
 }
 function match(...matchers) {
-  return async function matchFunc(response, options) {
+  return async function matchFunc(response, request, options) {
     let raw;
     let matcher;
     for (const match2 of matchers) {
@@ -35592,16 +35643,21 @@ function match(...matchers) {
       }
     }
     if (!matcher) {
-      const responseBody = await response.text();
       return [{
         ok: false,
-        error: new APIError("Unexpected API response status or content-type", response, responseBody)
-      }, responseBody];
+        error: new APIError("Unexpected Status or Content-Type", {
+          response,
+          request,
+          body: await response.text().catch(() => "")
+        })
+      }, raw];
     }
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
         break;
       case "jsonl":
         raw = response.body;
@@ -35613,16 +35669,19 @@ function match(...matchers) {
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
         raw = response.body && matcher.sseSentinel ? discardSentinel(response.body, matcher.sseSentinel) : response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       default:
         throw new Error(`Unsupported response type: ${encoding}`);
@@ -35630,7 +35689,7 @@ function match(...matchers) {
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new APIError("API error occurred", response, typeof raw === "string" ? raw : "")
+        error: new APIError("API error occurred", { request, response, body })
       }, raw];
     }
     const resultKey = matcher.key || options?.resultKey;
@@ -35639,7 +35698,10 @@ function match(...matchers) {
       data = {
         ...options?.extraFields,
         ...matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null,
-        ...isPlainObject(raw) ? raw : null
+        ...isPlainObject(raw) ? raw : null,
+        request$: request,
+        response$: response,
+        body$: body
       };
     } else if (resultKey) {
       data = {
@@ -35657,11 +35719,11 @@ function match(...matchers) {
       data = raw;
     }
     if ("err" in matcher) {
-      const result = safeParse(data, (v2) => matcher.schema.parse(v2), "Response validation failed");
+      const result = safeParseResponse(data, (v2) => matcher.schema.parse(v2), "Response validation failed", { request, response, body });
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(data, (v2) => matcher.schema.parse(v2), "Response validation failed"),
+        safeParseResponse(data, (v2) => matcher.schema.parse(v2), "Response validation failed", { request, response, body }),
         raw
       ];
     }
@@ -35674,27 +35736,24 @@ function unpackHeaders(headers) {
   }
   return out;
 }
-async function discardResponseBody(res) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
+function safeParseResponse(rawValue, fn, errorMessage, httpMeta) {
   try {
-    let done = false;
-    while (!done) {
-      const res2 = await reader.read();
-      done = res2.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK2(fn(rawValue));
+  } catch (err) {
+    return ERR(new ResponseValidationError(errorMessage, {
+      cause: err,
+      rawValue,
+      rawMessage: errorMessage,
+      ...httpMeta
+    }));
   }
 }
 var DEFAULT_CONTENT_TYPES, headerValRE;
 var init_matchers = __esm(() => {
   init_apierror();
+  init_responsevalidationerror();
   init_event_streams();
   init_http();
-  init_schemas();
   DEFAULT_CONTENT_TYPES = {
     jsonl: "application/jsonl",
     json: "application/json",
@@ -35736,6 +35795,18 @@ function compactMap(values) {
 var init_primitives = () => {
 };
 
+// src/lib/schemas.ts
+function safeParse(rawValue, fn, errorMessage) {
+  try {
+    return OK2(fn(rawValue));
+  } catch (err) {
+    return ERR(new SDKValidationError(errorMessage, err, rawValue));
+  }
+}
+var init_schemas = __esm(() => {
+  init_sdkvalidationerror();
+});
+
 // src/lib/security.ts
 function resolveSecurity(...options) {
   const state = {
@@ -35884,7 +35955,10 @@ var init_operation = __esm(() => {
     Append: "append",
     Read: "read",
     Trim: "trim",
-    Fence: "fence"
+    Fence: "fence",
+    AccountMetrics: "account-metrics",
+    BasinMetrics: "basin-metrics",
+    StreamMetrics: "stream-metrics"
   };
   Operation$inboundSchema = nativeEnumType(Operation);
   Operation$outboundSchema = Operation$inboundSchema;
@@ -36043,6 +36117,94 @@ var init_accesstokeninfo = __esm(() => {
   })(AccessTokenInfo$ ||= {});
 });
 
+// src/models/components/accountmetricset.ts
+var AccountMetricSet, AccountMetricSet$inboundSchema, AccountMetricSet$outboundSchema, AccountMetricSet$;
+var init_accountmetricset = __esm(() => {
+  init_esm();
+  AccountMetricSet = {
+    ActiveBasins: "active_basins",
+    AccountOps: "account_ops"
+  };
+  AccountMetricSet$inboundSchema = nativeEnumType(AccountMetricSet);
+  AccountMetricSet$outboundSchema = AccountMetricSet$inboundSchema;
+  ((AccountMetricSet$) => {
+    AccountMetricSet$.inboundSchema = AccountMetricSet$inboundSchema;
+    AccountMetricSet$.outboundSchema = AccountMetricSet$outboundSchema;
+  })(AccountMetricSet$ ||= {});
+});
+
+// src/models/components/metricunit.ts
+var MetricUnit, MetricUnit$inboundSchema, MetricUnit$outboundSchema, MetricUnit$;
+var init_metricunit = __esm(() => {
+  init_esm();
+  MetricUnit = {
+    Bytes: "bytes",
+    Operations: "operations"
+  };
+  MetricUnit$inboundSchema = nativeEnumType(MetricUnit);
+  MetricUnit$outboundSchema = MetricUnit$inboundSchema;
+  ((MetricUnit$) => {
+    MetricUnit$.inboundSchema = MetricUnit$inboundSchema;
+    MetricUnit$.outboundSchema = MetricUnit$outboundSchema;
+  })(MetricUnit$ ||= {});
+});
+
+// src/models/components/timeseriesinterval.ts
+var TimeseriesInterval, TimeseriesInterval$inboundSchema, TimeseriesInterval$outboundSchema, TimeseriesInterval$;
+var init_timeseriesinterval = __esm(() => {
+  init_esm();
+  TimeseriesInterval = {
+    Minute: "minute",
+    Hour: "hour",
+    Day: "day"
+  };
+  TimeseriesInterval$inboundSchema = nativeEnumType(TimeseriesInterval);
+  TimeseriesInterval$outboundSchema = TimeseriesInterval$inboundSchema;
+  ((TimeseriesInterval$) => {
+    TimeseriesInterval$.inboundSchema = TimeseriesInterval$inboundSchema;
+    TimeseriesInterval$.outboundSchema = TimeseriesInterval$outboundSchema;
+  })(TimeseriesInterval$ ||= {});
+});
+
+// src/models/components/accumulation.ts
+var Values$inboundSchema, Values$outboundSchema, Values$, Accumulation$inboundSchema, Accumulation$outboundSchema, Accumulation$;
+var init_accumulation = __esm(() => {
+  init_esm();
+  init_primitives();
+  init_metricunit();
+  init_timeseriesinterval();
+  Values$inboundSchema = unionType([numberType().int(), numberType()]);
+  Values$outboundSchema = unionType([numberType().int(), numberType()]);
+  ((Values$) => {
+    Values$.inboundSchema = Values$inboundSchema;
+    Values$.outboundSchema = Values$outboundSchema;
+  })(Values$ ||= {});
+  Accumulation$inboundSchema = objectType({
+    bucket_length: TimeseriesInterval$inboundSchema,
+    name: stringType(),
+    unit: MetricUnit$inboundSchema,
+    values: arrayType(arrayType(unionType([numberType().int(), numberType()])))
+  }).transform((v2) => {
+    return remap(v2, {
+      bucket_length: "bucketLength"
+    });
+  });
+  Accumulation$outboundSchema = objectType({
+    bucketLength: TimeseriesInterval$outboundSchema,
+    name: stringType(),
+    unit: MetricUnit$outboundSchema,
+    values: arrayType(arrayType(unionType([numberType().int(), numberType()])))
+  }).transform((v2) => {
+    return remap(v2, {
+      bucketLength: "bucket_length"
+    });
+  });
+  ((Accumulation$) => {
+    Accumulation$.inboundSchema = Accumulation$inboundSchema;
+    Accumulation$.outboundSchema = Accumulation$outboundSchema;
+  })(Accumulation$ ||= {});
+});
+
 // src/models/components/streamposition.ts
 var StreamPosition$inboundSchema, StreamPosition$outboundSchema, StreamPosition$;
 var init_streamposition = __esm(() => {
@@ -36339,6 +36501,26 @@ var init_basininfo = __esm(() => {
   })(BasinInfo$ ||= {});
 });
 
+// src/models/components/basinmetricset.ts
+var BasinMetricSet, BasinMetricSet$inboundSchema, BasinMetricSet$outboundSchema, BasinMetricSet$;
+var init_basinmetricset = __esm(() => {
+  init_esm();
+  BasinMetricSet = {
+    Storage: "storage",
+    AppendOps: "append_ops",
+    ReadOps: "read_ops",
+    ReadThroughput: "read_throughput",
+    AppendThroughput: "append_throughput",
+    BasinOps: "basin_ops"
+  };
+  BasinMetricSet$inboundSchema = nativeEnumType(BasinMetricSet);
+  BasinMetricSet$outboundSchema = BasinMetricSet$inboundSchema;
+  ((BasinMetricSet$) => {
+    BasinMetricSet$.inboundSchema = BasinMetricSet$inboundSchema;
+    BasinMetricSet$.outboundSchema = BasinMetricSet$outboundSchema;
+  })(BasinMetricSet$ ||= {});
+});
+
 // src/models/components/timestampingreconfiguration.ts
 var TimestampingReconfiguration$inboundSchema, TimestampingReconfiguration$outboundSchema, TimestampingReconfiguration$;
 var init_timestampingreconfiguration = __esm(() => {
@@ -36499,11 +36681,38 @@ var init_createstreamrequest = __esm(() => {
   })(CreateStreamRequest$ ||= {});
 });
 
-// src/models/components/issueaccesstokenresponse.ts
-var IssueAccessTokenResponse$inboundSchema, IssueAccessTokenResponse$outboundSchema, IssueAccessTokenResponse$;
-var init_issueaccesstokenresponse = __esm(() => {
+// src/models/components/gauge.ts
+var GaugeValues$inboundSchema, GaugeValues$outboundSchema, GaugeValues$, Gauge$inboundSchema, Gauge$outboundSchema, Gauge$;
+var init_gauge = __esm(() => {
   init_esm();
-  init_primitives();
+  init_metricunit();
+  GaugeValues$inboundSchema = unionType([numberType().int(), numberType()]);
+  GaugeValues$outboundSchema = unionType([numberType().int(), numberType()]);
+  ((GaugeValues$) => {
+    GaugeValues$.inboundSchema = GaugeValues$inboundSchema;
+    GaugeValues$.outboundSchema = GaugeValues$outboundSchema;
+  })(GaugeValues$ ||= {});
+  Gauge$inboundSchema = objectType({
+    name: stringType(),
+    unit: MetricUnit$inboundSchema,
+    values: arrayType(arrayType(unionType([numberType().int(), numberType()])))
+  });
+  Gauge$outboundSchema = objectType({
+    name: stringType(),
+    unit: MetricUnit$outboundSchema,
+    values: arrayType(arrayType(unionType([numberType().int(), numberType()])))
+  });
+  ((Gauge$) => {
+    Gauge$.inboundSchema = Gauge$inboundSchema;
+    Gauge$.outboundSchema = Gauge$outboundSchema;
+  })(Gauge$ ||= {});
+});
+
+// src/models/components/issueaccesstokenresponse.ts
+var IssueAccessTokenResponse$inboundSchema, IssueAccessTokenResponse$outboundSchema, IssueAccessTokenResponse$;
+var init_issueaccesstokenresponse = __esm(() => {
+  init_esm();
+  init_primitives();
   IssueAccessTokenResponse$inboundSchema = objectType({
     access_token: stringType()
   }).transform((v2) => {
@@ -36524,6 +36733,24 @@ var init_issueaccesstokenresponse = __esm(() => {
   })(IssueAccessTokenResponse$ ||= {});
 });
 
+// src/models/components/label.ts
+var Label$inboundSchema, Label$outboundSchema, Label$;
+var init_label = __esm(() => {
+  init_esm();
+  Label$inboundSchema = objectType({
+    name: stringType(),
+    values: arrayType(stringType())
+  });
+  Label$outboundSchema = objectType({
+    name: stringType(),
+    values: arrayType(stringType())
+  });
+  ((Label$) => {
+    Label$.inboundSchema = Label$inboundSchema;
+    Label$.outboundSchema = Label$outboundSchema;
+  })(Label$ ||= {});
+});
+
 // src/models/components/listaccesstokensresponse.ts
 var ListAccessTokensResponse$inboundSchema, ListAccessTokensResponse$outboundSchema, ListAccessTokensResponse$;
 var init_listaccesstokensresponse = __esm(() => {
@@ -36641,6 +36868,110 @@ var init_liststreamsresponse = __esm(() => {
   })(ListStreamsResponse$ ||= {});
 });
 
+// src/models/components/scalar.ts
+var Scalar$inboundSchema, Scalar$outboundSchema, Scalar$;
+var init_scalar = __esm(() => {
+  init_esm();
+  init_metricunit();
+  Scalar$inboundSchema = objectType({
+    name: stringType(),
+    unit: MetricUnit$inboundSchema,
+    value: numberType()
+  });
+  Scalar$outboundSchema = objectType({
+    name: stringType(),
+    unit: MetricUnit$outboundSchema,
+    value: numberType()
+  });
+  ((Scalar$) => {
+    Scalar$.inboundSchema = Scalar$inboundSchema;
+    Scalar$.outboundSchema = Scalar$outboundSchema;
+  })(Scalar$ ||= {});
+});
+
+// src/models/components/metric.ts
+var Four$inboundSchema, Four$outboundSchema, Four$, Three$inboundSchema, Three$outboundSchema, Three$, Two$inboundSchema, Two$outboundSchema, Two$, Metric1$inboundSchema, Metric1$outboundSchema, Metric1$, Metric$inboundSchema, Metric$outboundSchema, Metric$;
+var init_metric = __esm(() => {
+  init_esm();
+  init_accumulation();
+  init_gauge();
+  init_label();
+  init_scalar();
+  Four$inboundSchema = objectType({
+    label: Label$inboundSchema
+  });
+  Four$outboundSchema = objectType({
+    label: Label$outboundSchema
+  });
+  ((Four$) => {
+    Four$.inboundSchema = Four$inboundSchema;
+    Four$.outboundSchema = Four$outboundSchema;
+  })(Four$ ||= {});
+  Three$inboundSchema = objectType({
+    gauge: Gauge$inboundSchema
+  });
+  Three$outboundSchema = objectType({
+    gauge: Gauge$outboundSchema
+  });
+  ((Three$) => {
+    Three$.inboundSchema = Three$inboundSchema;
+    Three$.outboundSchema = Three$outboundSchema;
+  })(Three$ ||= {});
+  Two$inboundSchema = objectType({
+    accumulation: Accumulation$inboundSchema
+  });
+  Two$outboundSchema = objectType({
+    accumulation: Accumulation$outboundSchema
+  });
+  ((Two$) => {
+    Two$.inboundSchema = Two$inboundSchema;
+    Two$.outboundSchema = Two$outboundSchema;
+  })(Two$ ||= {});
+  Metric1$inboundSchema = objectType({
+    scalar: Scalar$inboundSchema
+  });
+  Metric1$outboundSchema = objectType({
+    scalar: Scalar$outboundSchema
+  });
+  ((Metric1$) => {
+    Metric1$.inboundSchema = Metric1$inboundSchema;
+    Metric1$.outboundSchema = Metric1$outboundSchema;
+  })(Metric1$ ||= {});
+  Metric$inboundSchema = unionType([
+    lazyType(() => Metric1$inboundSchema),
+    lazyType(() => Two$inboundSchema),
+    lazyType(() => Three$inboundSchema),
+    lazyType(() => Four$inboundSchema)
+  ]);
+  Metric$outboundSchema = unionType([
+    lazyType(() => Metric1$outboundSchema),
+    lazyType(() => Two$outboundSchema),
+    lazyType(() => Three$outboundSchema),
+    lazyType(() => Four$outboundSchema)
+  ]);
+  ((Metric$) => {
+    Metric$.inboundSchema = Metric$inboundSchema;
+    Metric$.outboundSchema = Metric$outboundSchema;
+  })(Metric$ ||= {});
+});
+
+// src/models/components/metricsetresponse.ts
+var MetricSetResponse$inboundSchema, MetricSetResponse$outboundSchema, MetricSetResponse$;
+var init_metricsetresponse = __esm(() => {
+  init_esm();
+  init_metric();
+  MetricSetResponse$inboundSchema = objectType({
+    values: arrayType(Metric$inboundSchema)
+  });
+  MetricSetResponse$outboundSchema = objectType({
+    values: arrayType(Metric$outboundSchema)
+  });
+  ((MetricSetResponse$) => {
+    MetricSetResponse$.inboundSchema = MetricSetResponse$inboundSchema;
+    MetricSetResponse$.outboundSchema = MetricSetResponse$outboundSchema;
+  })(MetricSetResponse$ ||= {});
+});
+
 // src/models/components/pingeventdata.ts
 var PingEventData$inboundSchema, PingEventData$outboundSchema, PingEventData$;
 var init_pingeventdata = __esm(() => {
@@ -36693,11 +37024,14 @@ var ReadBatch$inboundSchema, ReadBatch$outboundSchema, ReadBatch$;
 var init_readbatch = __esm(() => {
   init_esm();
   init_sequencedrecord();
+  init_streamposition();
   ReadBatch$inboundSchema = objectType({
-    records: arrayType(SequencedRecord$inboundSchema)
+    records: arrayType(SequencedRecord$inboundSchema),
+    tail: nullableType(StreamPosition$inboundSchema).optional()
   });
   ReadBatch$outboundSchema = objectType({
-    records: arrayType(SequencedRecord$outboundSchema)
+    records: arrayType(SequencedRecord$outboundSchema),
+    tail: nullableType(StreamPosition$outboundSchema).optional()
   });
   ((ReadBatch$) => {
     ReadBatch$.inboundSchema = ReadBatch$inboundSchema;
@@ -36705,27 +37039,48 @@ var init_readbatch = __esm(() => {
   })(ReadBatch$ ||= {});
 });
 
+// src/models/components/tailresponse.ts
+var TailResponse$inboundSchema, TailResponse$outboundSchema, TailResponse$;
+var init_tailresponse = __esm(() => {
+  init_esm();
+  init_streamposition();
+  TailResponse$inboundSchema = objectType({
+    tail: StreamPosition$inboundSchema
+  });
+  TailResponse$outboundSchema = objectType({
+    tail: StreamPosition$outboundSchema
+  });
+  ((TailResponse$) => {
+    TailResponse$.inboundSchema = TailResponse$inboundSchema;
+    TailResponse$.outboundSchema = TailResponse$outboundSchema;
+  })(TailResponse$ ||= {});
+});
+
 // src/models/components/readevent.ts
-var ReadEvent3Event, ReadEventEvent, Event, ReadEvent3Event$inboundSchema, ReadEvent3Event$outboundSchema, ReadEvent3Event$, Ping$inboundSchema, Ping$outboundSchema, Ping$, ReadEventEvent$inboundSchema, ReadEventEvent$outboundSchema, ReadEventEvent$, ErrorT$inboundSchema, ErrorT$outboundSchema, ErrorT$, Event$inboundSchema, Event$outboundSchema, Event$, Batch$inboundSchema, Batch$outboundSchema, Batch$, ReadEvent$inboundSchema, ReadEvent$outboundSchema, ReadEvent$;
+var ReadEvent4Event, ReadEvent3Event, ReadEventEvent, Event, ReadEvent4Event$inboundSchema, ReadEvent4Event$outboundSchema, ReadEvent4Event$, Ping$inboundSchema, Ping$outboundSchema, Ping$, ReadEvent3Event$inboundSchema, ReadEvent3Event$outboundSchema, ReadEvent3Event$, ErrorT$inboundSchema, ErrorT$outboundSchema, ErrorT$, ReadEventEvent$inboundSchema, ReadEventEvent$outboundSchema, ReadEventEvent$, ReadEvent2$inboundSchema, ReadEvent2$outboundSchema, ReadEvent2$, Event$inboundSchema, Event$outboundSchema, Event$, Batch$inboundSchema, Batch$outboundSchema, Batch$, ReadEvent$inboundSchema, ReadEvent$outboundSchema, ReadEvent$;
 var init_readevent = __esm(() => {
   init_esm();
   init_pingeventdata();
   init_readbatch();
-  ReadEvent3Event = {
+  init_tailresponse();
+  ReadEvent4Event = {
     Ping: "ping"
   };
-  ReadEventEvent = {
+  ReadEvent3Event = {
     Error: "error"
   };
+  ReadEventEvent = {
+    Tail: "tail"
+  };
   Event = {
     Batch: "batch"
   };
-  ReadEvent3Event$inboundSchema = nativeEnumType(ReadEvent3Event);
-  ReadEvent3Event$outboundSchema = ReadEvent3Event$inboundSchema;
-  ((ReadEvent3Event$) => {
-    ReadEvent3Event$.inboundSchema = ReadEvent3Event$inboundSchema;
-    ReadEvent3Event$.outboundSchema = ReadEvent3Event$outboundSchema;
-  })(ReadEvent3Event$ ||= {});
+  ReadEvent4Event$inboundSchema = nativeEnumType(ReadEvent4Event);
+  ReadEvent4Event$outboundSchema = ReadEvent4Event$inboundSchema;
+  ((ReadEvent4Event$) => {
+    ReadEvent4Event$.inboundSchema = ReadEvent4Event$inboundSchema;
+    ReadEvent4Event$.outboundSchema = ReadEvent4Event$outboundSchema;
+  })(ReadEvent4Event$ ||= {});
   Ping$inboundSchema = objectType({
     data: stringType().transform((v2, ctx) => {
       try {
@@ -36738,34 +37093,62 @@ var init_readevent = __esm(() => {
         return NEVER;
       }
     }).pipe(PingEventData$inboundSchema),
-    event: ReadEvent3Event$inboundSchema
+    event: ReadEvent4Event$inboundSchema
   });
   Ping$outboundSchema = objectType({
     data: PingEventData$outboundSchema,
-    event: ReadEvent3Event$outboundSchema
+    event: ReadEvent4Event$outboundSchema
   });
   ((Ping$) => {
     Ping$.inboundSchema = Ping$inboundSchema;
     Ping$.outboundSchema = Ping$outboundSchema;
   })(Ping$ ||= {});
-  ReadEventEvent$inboundSchema = nativeEnumType(ReadEventEvent);
-  ReadEventEvent$outboundSchema = ReadEventEvent$inboundSchema;
-  ((ReadEventEvent$) => {
-    ReadEventEvent$.inboundSchema = ReadEventEvent$inboundSchema;
-    ReadEventEvent$.outboundSchema = ReadEventEvent$outboundSchema;
-  })(ReadEventEvent$ ||= {});
+  ReadEvent3Event$inboundSchema = nativeEnumType(ReadEvent3Event);
+  ReadEvent3Event$outboundSchema = ReadEvent3Event$inboundSchema;
+  ((ReadEvent3Event$) => {
+    ReadEvent3Event$.inboundSchema = ReadEvent3Event$inboundSchema;
+    ReadEvent3Event$.outboundSchema = ReadEvent3Event$outboundSchema;
+  })(ReadEvent3Event$ ||= {});
   ErrorT$inboundSchema = objectType({
     data: stringType(),
-    event: ReadEventEvent$inboundSchema
+    event: ReadEvent3Event$inboundSchema
   });
   ErrorT$outboundSchema = objectType({
     data: stringType(),
-    event: ReadEventEvent$outboundSchema
+    event: ReadEvent3Event$outboundSchema
   });
   ((ErrorT$) => {
     ErrorT$.inboundSchema = ErrorT$inboundSchema;
     ErrorT$.outboundSchema = ErrorT$outboundSchema;
   })(ErrorT$ ||= {});
+  ReadEventEvent$inboundSchema = nativeEnumType(ReadEventEvent);
+  ReadEventEvent$outboundSchema = ReadEventEvent$inboundSchema;
+  ((ReadEventEvent$) => {
+    ReadEventEvent$.inboundSchema = ReadEventEvent$inboundSchema;
+    ReadEventEvent$.outboundSchema = ReadEventEvent$outboundSchema;
+  })(ReadEventEvent$ ||= {});
+  ReadEvent2$inboundSchema = objectType({
+    data: stringType().transform((v2, ctx) => {
+      try {
+        return JSON.parse(v2);
+      } catch (err) {
+        ctx.addIssue({
+          code: ZodIssueCode.custom,
+          message: `malformed json: ${err}`
+        });
+        return NEVER;
+      }
+    }).pipe(TailResponse$inboundSchema),
+    event: ReadEventEvent$inboundSchema
+  });
+  ReadEvent2$outboundSchema = objectType({
+    data: TailResponse$outboundSchema,
+    event: ReadEventEvent$outboundSchema
+  });
+  ((ReadEvent2$) => {
+    ReadEvent2$.inboundSchema = ReadEvent2$inboundSchema;
+    ReadEvent2$.outboundSchema = ReadEvent2$outboundSchema;
+  })(ReadEvent2$ ||= {});
   Event$inboundSchema = nativeEnumType(Event);
   Event$outboundSchema = Event$inboundSchema;
   ((Event$) => {
@@ -36797,11 +37180,13 @@ var init_readevent = __esm(() => {
     Batch$.outboundSchema = Batch$outboundSchema;
   })(Batch$ ||= {});
   ReadEvent$inboundSchema = unionType([
+    lazyType(() => ReadEvent2$inboundSchema),
     lazyType(() => ErrorT$inboundSchema),
     lazyType(() => Ping$inboundSchema),
     lazyType(() => Batch$inboundSchema)
   ]);
   ReadEvent$outboundSchema = unionType([
+    lazyType(() => ReadEvent2$outboundSchema),
     lazyType(() => ErrorT$outboundSchema),
     lazyType(() => Ping$outboundSchema),
     lazyType(() => Batch$outboundSchema)
@@ -36853,42 +37238,33 @@ var init_security2 = __esm(() => {
   })(Security$ ||= {});
 });
 
-// src/models/components/tailresponse.ts
-var TailResponse$inboundSchema, TailResponse$outboundSchema, TailResponse$;
-var init_tailresponse = __esm(() => {
-  init_esm();
-  init_streamposition();
-  TailResponse$inboundSchema = objectType({
-    tail: StreamPosition$inboundSchema
-  });
-  TailResponse$outboundSchema = objectType({
-    tail: StreamPosition$outboundSchema
-  });
-  ((TailResponse$) => {
-    TailResponse$.inboundSchema = TailResponse$inboundSchema;
-    TailResponse$.outboundSchema = TailResponse$outboundSchema;
-  })(TailResponse$ ||= {});
-});
-
 // src/models/components/index.ts
 var init_components = __esm(() => {
   init_accesstokeninfo();
   init_accesstokenscope();
+  init_accountmetricset();
+  init_accumulation();
   init_appendack();
   init_appendinput();
   init_appendrecord();
   init_basinconfig();
   init_basininfo();
+  init_basinmetricset();
   init_basinreconfiguration();
   init_basinscope();
   init_basinstate();
   init_createbasinrequest();
   init_createorreconfigurebasinrequest();
   init_createstreamrequest();
+  init_gauge();
   init_issueaccesstokenresponse();
+  init_label();
   init_listaccesstokensresponse();
   init_listbasinsresponse();
   init_liststreamsresponse();
+  init_metric();
+  init_metricsetresponse();
+  init_metricunit();
   init_operation();
   init_permittedoperationgroups();
   init_pingeventdata();
@@ -36898,6 +37274,7 @@ var init_components = __esm(() => {
   init_resourceset();
   init_retentionpolicy();
   init_s2format();
+  init_scalar();
   init_security2();
   init_sequencedrecord();
   init_storageclass();
@@ -36906,6 +37283,7 @@ var init_components = __esm(() => {
   init_streamposition();
   init_streamreconfiguration();
   init_tailresponse();
+  init_timeseriesinterval();
   init_timestampingconfig();
   init_timestampingmode();
   init_timestampingreconfiguration();
@@ -36916,35 +37294,43 @@ var SeqNum, FencingToken, SeqNum$inboundSchema, SeqNum$outboundSchema, SeqNum$,
 var init_appendconditionfailed = __esm(() => {
   init_esm();
   init_primitives();
-  SeqNum = class SeqNum extends Error {
+  init_s2error();
+  SeqNum = class SeqNum extends S2Error {
     seqNumMismatch;
     data$;
-    constructor(err) {
+    constructor(err, httpMeta) {
       const message = "message" in err && typeof err.message === "string" ? err.message : `API error occurred: ${JSON.stringify(err)}`;
-      super(message);
+      super(message, httpMeta);
       this.data$ = err;
       this.seqNumMismatch = err.seqNumMismatch;
       this.name = "SeqNum";
     }
   };
-  FencingToken = class FencingToken extends Error {
+  FencingToken = class FencingToken extends S2Error {
     fencingTokenMismatch;
     data$;
-    constructor(err) {
+    constructor(err, httpMeta) {
       const message = "message" in err && typeof err.message === "string" ? err.message : `API error occurred: ${JSON.stringify(err)}`;
-      super(message);
+      super(message, httpMeta);
       this.data$ = err;
       this.fencingTokenMismatch = err.fencingTokenMismatch;
       this.name = "FencingToken";
     }
   };
   SeqNum$inboundSchema = objectType({
-    seq_num_mismatch: numberType().int()
+    seq_num_mismatch: numberType().int(),
+    request$: instanceOfType(Request),
+    response$: instanceOfType(Response),
+    body$: stringType()
   }).transform((v2) => {
     const remapped = remap(v2, {
       seq_num_mismatch: "seqNumMismatch"
     });
-    return new SeqNum(remapped);
+    return new SeqNum(remapped, {
+      request: v2.request$,
+      response: v2.response$,
+      body: v2.body$
+    });
   });
   SeqNum$outboundSchema = instanceOfType(SeqNum).transform((v2) => v2.data$).pipe(objectType({
     seqNumMismatch: numberType().int()
@@ -36958,12 +37344,19 @@ var init_appendconditionfailed = __esm(() => {
     SeqNum$.outboundSchema = SeqNum$outboundSchema;
   })(SeqNum$ ||= {});
   FencingToken$inboundSchema = objectType({
-    fencing_token_mismatch: stringType()
+    fencing_token_mismatch: stringType(),
+    request$: instanceOfType(Request),
+    response$: instanceOfType(Response),
+    body$: stringType()
   }).transform((v2) => {
     const remapped = remap(v2, {
       fencing_token_mismatch: "fencingTokenMismatch"
     });
-    return new FencingToken(remapped);
+    return new FencingToken(remapped, {
+      request: v2.request$,
+      response: v2.response$,
+      body: v2.body$
+    });
   });
   FencingToken$outboundSchema = instanceOfType(FencingToken).transform((v2) => v2.data$).pipe(objectType({
     fencingTokenMismatch: stringType()
@@ -36994,12 +37387,13 @@ var init_appendconditionfailed = __esm(() => {
 var ErrorResponse, ErrorResponse$inboundSchema, ErrorResponse$outboundSchema, ErrorResponse$;
 var init_errorresponse = __esm(() => {
   init_esm();
-  ErrorResponse = class ErrorResponse extends Error {
+  init_s2error();
+  ErrorResponse = class ErrorResponse extends S2Error {
     code;
     data$;
-    constructor(err) {
+    constructor(err, httpMeta) {
       const message = "message" in err && typeof err.message === "string" ? err.message : `API error occurred: ${JSON.stringify(err)}`;
-      super(message);
+      super(message, httpMeta);
       this.data$ = err;
       if (err.code != null)
         this.code = err.code;
@@ -37008,9 +37402,16 @@ var init_errorresponse = __esm(() => {
   };
   ErrorResponse$inboundSchema = objectType({
     code: nullableType(stringType()).optional(),
-    message: stringType()
+    message: stringType(),
+    request$: instanceOfType(Request),
+    response$: instanceOfType(Response),
+    body$: stringType()
   }).transform((v2) => {
-    return new ErrorResponse(v2);
+    return new ErrorResponse(v2, {
+      request: v2.request$,
+      response: v2.response$,
+      body: v2.body$
+    });
   });
   ErrorResponse$outboundSchema = instanceOfType(ErrorResponse).transform((v2) => v2.data$).pipe(objectType({
     code: nullableType(stringType()).optional(),
@@ -37023,27 +37424,35 @@ var init_errorresponse = __esm(() => {
 });
 
 // src/models/errors/tailresponse.ts
-var TailResponse, TailResponse$inboundSchema2, TailResponse$outboundSchema2, TailResponse$2;
+var TailResponse2, TailResponse$inboundSchema2, TailResponse$outboundSchema2, TailResponse$2;
 var init_tailresponse2 = __esm(() => {
   init_esm();
   init_components();
-  TailResponse = class TailResponse extends Error {
+  init_s2error();
+  TailResponse2 = class TailResponse2 extends S2Error {
     tail;
     data$;
-    constructor(err) {
+    constructor(err, httpMeta) {
       const message = "message" in err && typeof err.message === "string" ? err.message : `API error occurred: ${JSON.stringify(err)}`;
-      super(message);
+      super(message, httpMeta);
       this.data$ = err;
       this.tail = err.tail;
       this.name = "TailResponse";
     }
   };
   TailResponse$inboundSchema2 = objectType({
-    tail: StreamPosition$inboundSchema
+    tail: StreamPosition$inboundSchema,
+    request$: instanceOfType(Request),
+    response$: instanceOfType(Response),
+    body$: stringType()
   }).transform((v2) => {
-    return new TailResponse(v2);
+    return new TailResponse2(v2, {
+      request: v2.request$,
+      response: v2.response$,
+      body: v2.body$
+    });
   });
-  TailResponse$outboundSchema2 = instanceOfType(TailResponse).transform((v2) => v2.data$).pipe(objectType({
+  TailResponse$outboundSchema2 = instanceOfType(TailResponse2).transform((v2) => v2.data$).pipe(objectType({
     tail: StreamPosition$outboundSchema
   }));
   ((TailResponse$) => {
@@ -37058,6 +37467,7 @@ var init_errors2 = __esm(() => {
   init_appendconditionfailed();
   init_errorresponse();
   init_httpclienterrors();
+  init_responsevalidationerror();
   init_sdkvalidationerror();
   init_tailresponse2();
 });
@@ -37108,6 +37518,7 @@ async function $do(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "issue_access_token",
     oAuth2Scopes: [],
@@ -37123,6 +37534,7 @@ async function $do(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -37142,7 +37554,7 @@ async function $do(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(201, IssueAccessTokenResponse$inboundSchema), jsonErr([400, 403, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(201, IssueAccessTokenResponse$inboundSchema), jsonErr([400, 403, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -37188,6 +37600,29 @@ var init_accessTokensIssueAccessToken2 = __esm(() => {
   };
 });
 
+// src/models/operations/accountmetrics.ts
+var AccountMetricsRequest$inboundSchema, AccountMetricsRequest$outboundSchema, AccountMetricsRequest$;
+var init_accountmetrics = __esm(() => {
+  init_esm();
+  init_components();
+  AccountMetricsRequest$inboundSchema = objectType({
+    set: AccountMetricSet$inboundSchema,
+    start: numberType().int().optional(),
+    end: numberType().int().optional(),
+    interval: TimeseriesInterval$inboundSchema.optional()
+  });
+  AccountMetricsRequest$outboundSchema = objectType({
+    set: AccountMetricSet$outboundSchema,
+    start: numberType().int().optional(),
+    end: numberType().int().optional(),
+    interval: TimeseriesInterval$outboundSchema.optional()
+  });
+  ((AccountMetricsRequest$) => {
+    AccountMetricsRequest$.inboundSchema = AccountMetricsRequest$inboundSchema;
+    AccountMetricsRequest$.outboundSchema = AccountMetricsRequest$outboundSchema;
+  })(AccountMetricsRequest$ ||= {});
+});
+
 // src/models/operations/append.ts
 var AppendServerList, AppendRequest$inboundSchema, AppendRequest$outboundSchema, AppendRequest$;
 var init_append = __esm(() => {
@@ -37227,6 +37662,31 @@ var init_append = __esm(() => {
   })(AppendRequest$ ||= {});
 });
 
+// src/models/operations/basinmetrics.ts
+var BasinMetricsRequest$inboundSchema, BasinMetricsRequest$outboundSchema, BasinMetricsRequest$;
+var init_basinmetrics = __esm(() => {
+  init_esm();
+  init_components();
+  BasinMetricsRequest$inboundSchema = objectType({
+    set: BasinMetricSet$inboundSchema,
+    start: numberType().int().optional(),
+    end: numberType().int().optional(),
+    interval: TimeseriesInterval$inboundSchema.optional(),
+    basin: stringType()
+  });
+  BasinMetricsRequest$outboundSchema = objectType({
+    set: BasinMetricSet$outboundSchema,
+    start: numberType().int().optional(),
+    end: numberType().int().optional(),
+    interval: TimeseriesInterval$outboundSchema.optional(),
+    basin: stringType()
+  });
+  ((BasinMetricsRequest$) => {
+    BasinMetricsRequest$.inboundSchema = BasinMetricsRequest$inboundSchema;
+    BasinMetricsRequest$.outboundSchema = BasinMetricsRequest$outboundSchema;
+  })(BasinMetricsRequest$ ||= {});
+});
+
 // src/models/operations/checktail.ts
 var CheckTailServerList, CheckTailRequest$inboundSchema, CheckTailRequest$outboundSchema, CheckTailRequest$;
 var init_checktail = __esm(() => {
@@ -37603,6 +38063,7 @@ var init_read = __esm(() => {
     tail_offset: numberType().int().optional(),
     count: numberType().int().optional(),
     bytes: numberType().int().optional(),
+    until: numberType().int().optional(),
     "s2-basin": stringType()
   }).transform((v2) => {
     return remap(v2, {
@@ -37620,6 +38081,7 @@ var init_read = __esm(() => {
     tailOffset: numberType().int().optional(),
     count: numberType().int().optional(),
     bytes: numberType().int().optional(),
+    until: numberType().int().optional(),
     s2Basin: stringType()
   }).transform((v2) => {
     return remap(v2, {
@@ -37731,9 +38193,29 @@ var init_revokeaccesstoken = __esm(() => {
   })(RevokeAccessTokenRequest$ ||= {});
 });
 
+// src/models/operations/streammetrics.ts
+var StreamMetricsRequest$inboundSchema, StreamMetricsRequest$outboundSchema, StreamMetricsRequest$;
+var init_streammetrics = __esm(() => {
+  init_esm();
+  StreamMetricsRequest$inboundSchema = objectType({
+    basin: stringType(),
+    stream: stringType()
+  });
+  StreamMetricsRequest$outboundSchema = objectType({
+    basin: stringType(),
+    stream: stringType()
+  });
+  ((StreamMetricsRequest$) => {
+    StreamMetricsRequest$.inboundSchema = StreamMetricsRequest$inboundSchema;
+    StreamMetricsRequest$.outboundSchema = StreamMetricsRequest$outboundSchema;
+  })(StreamMetricsRequest$ ||= {});
+});
+
 // src/models/operations/index.ts
 var init_operations = __esm(() => {
+  init_accountmetrics();
   init_append();
+  init_basinmetrics();
   init_checktail();
   init_createorreconfigurebasin();
   init_createorreconfigurestream();
@@ -37749,6 +38231,7 @@ var init_operations = __esm(() => {
   init_reconfigurebasin();
   init_reconfigurestream();
   init_revokeaccesstoken();
+  init_streammetrics();
 });
 
 // src/funcs/accessTokensListAccessTokens.ts
@@ -37775,6 +38258,7 @@ async function $do2(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "list_access_tokens",
     oAuth2Scopes: [],
@@ -37791,6 +38275,7 @@ async function $do2(client, request, options) {
     headers,
     query,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -37810,7 +38295,7 @@ async function $do2(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, ListAccessTokensResponse$inboundSchema), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, ListAccessTokensResponse$inboundSchema), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -37882,6 +38367,7 @@ async function $do3(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "revoke_access_token",
     oAuth2Scopes: [],
@@ -37897,6 +38383,7 @@ async function $do3(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -37916,7 +38403,7 @@ async function $do3(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(nil(200, voidType()), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(nil(200, voidType()), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -37982,6 +38469,7 @@ async function $do4(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "create_basin",
     oAuth2Scopes: [],
@@ -37997,6 +38485,7 @@ async function $do4(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -38016,7 +38505,7 @@ async function $do4(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(201, BasinInfo$inboundSchema), jsonErr([400, 401, 403, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(201, BasinInfo$inboundSchema), jsonErr([400, 401, 403, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -38091,6 +38580,7 @@ async function $do5(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "create_or_reconfigure_basin",
     oAuth2Scopes: [],
@@ -38106,6 +38596,7 @@ async function $do5(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -38125,7 +38616,7 @@ async function $do5(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(201, BasinInfo$inboundSchema.optional()), nil(204, BasinInfo$inboundSchema.optional()), jsonErr(400, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(201, BasinInfo$inboundSchema.optional()), nil(204, BasinInfo$inboundSchema.optional()), jsonErr(400, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -38197,6 +38688,7 @@ async function $do6(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "delete_basin",
     oAuth2Scopes: [],
@@ -38212,6 +38704,7 @@ async function $do6(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -38231,7 +38724,7 @@ async function $do6(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(nil(202, voidType()), jsonErr([400, 401, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(nil(202, voidType()), jsonErr([400, 401, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -38302,6 +38795,7 @@ async function $do7(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "get_basin_config",
     oAuth2Scopes: [],
@@ -38317,6 +38811,7 @@ async function $do7(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -38336,7 +38831,7 @@ async function $do7(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, BasinConfig$inboundSchema), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, BasinConfig$inboundSchema), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42226,6 +42721,7 @@ async function $do8(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "list_basins",
     oAuth2Scopes: [],
@@ -42242,6 +42738,7 @@ async function $do8(client, request, options) {
     headers,
     query: query2,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42261,7 +42758,7 @@ async function $do8(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result, raw] = await match(json(200, ListBasinsResponse$inboundSchema2, { key: "Result" }), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result, raw] = await match(json(200, ListBasinsResponse$inboundSchema2, { key: "Result" }), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [haltIterator(result), {
       status: "complete",
@@ -42357,6 +42854,7 @@ async function $do9(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "reconfigure_basin",
     oAuth2Scopes: [],
@@ -42372,6 +42870,7 @@ async function $do9(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42391,7 +42890,7 @@ async function $do9(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, BasinConfig$inboundSchema), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, BasinConfig$inboundSchema), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42438,11 +42937,347 @@ var init_basinsReconfigureBasin2 = __esm(() => {
   };
 });
 
-// src/funcs/recordsAppend.ts
-function recordsAppend(client, request, options) {
+// src/funcs/metricsAccountMetrics.ts
+function metricsAccountMetrics(client, request, options) {
   return new APIPromise($do10(client, request, options));
 }
 async function $do10(client, request, options) {
+  const parsed = safeParse(request, (value2) => AccountMetricsRequest$outboundSchema.parse(value2), "Input validation failed");
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = null;
+  const path = pathToFunc("/metrics")();
+  const query2 = encodeFormQuery({
+    end: payload.end,
+    interval: payload.interval,
+    set: payload.set,
+    start: payload.start
+  });
+  const headers = new Headers(compactMap({
+    Accept: "application/json"
+  }));
+  const secConfig = await extractSecurity(client._options.accessToken);
+  const securityInput = secConfig == null ? {} : { accessToken: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+  const context = {
+    options: client._options,
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "account_metrics",
+    oAuth2Scopes: [],
+    resolvedSecurity: requestSecurity,
+    securitySource: client._options.accessToken,
+    retryConfig: options?.retries || client._options.retryConfig || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"]
+  };
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "GET",
+    baseURL: options?.serverURL,
+    path,
+    headers,
+    query: query2,
+    body,
+    userAgent: client._options.userAgent,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["400", "403", "4XX", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req }
+  };
+  const [result] = await match(json(200, MetricSetResponse$inboundSchema), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+  return [result, { status: "complete", request: req, response }];
+}
+var init_metricsAccountMetrics = __esm(() => {
+  init_encodings();
+  init_matchers();
+  init_primitives();
+  init_schemas();
+  init_security();
+  init_url();
+  init_components();
+  init_errors2();
+  init_operations();
+  init_async();
+});
+
+// src/mcp-server/tools/metricsAccountMetrics.ts
+var args10, tool$metricsAccountMetrics;
+var init_metricsAccountMetrics2 = __esm(() => {
+  init_metricsAccountMetrics();
+  init_operations();
+  init_tools();
+  args10 = {
+    request: AccountMetricsRequest$inboundSchema
+  };
+  tool$metricsAccountMetrics = {
+    name: "metrics-account-metrics",
+    description: `Get account level metrics.`,
+    scopes: ["read", "read", "read"],
+    args: args10,
+    tool: async (client, args11, ctx) => {
+      const [result, apiCall] = await metricsAccountMetrics(client, args11.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+      if (!result.ok) {
+        return {
+          content: [{ type: "text", text: result.error.message }],
+          isError: true
+        };
+      }
+      const value2 = result.value;
+      return formatResult(value2, apiCall);
+    }
+  };
+});
+
+// src/funcs/metricsBasinMetrics.ts
+function metricsBasinMetrics(client, request, options) {
+  return new APIPromise($do11(client, request, options));
+}
+async function $do11(client, request, options) {
+  const parsed = safeParse(request, (value2) => BasinMetricsRequest$outboundSchema.parse(value2), "Input validation failed");
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = null;
+  const pathParams = {
+    basin: encodeSimple("basin", payload.basin, {
+      explode: false,
+      charEncoding: "percent"
+    })
+  };
+  const path = pathToFunc("/metrics/{basin}")(pathParams);
+  const query2 = encodeFormQuery({
+    end: payload.end,
+    interval: payload.interval,
+    set: payload.set,
+    start: payload.start
+  });
+  const headers = new Headers(compactMap({
+    Accept: "application/json"
+  }));
+  const secConfig = await extractSecurity(client._options.accessToken);
+  const securityInput = secConfig == null ? {} : { accessToken: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+  const context = {
+    options: client._options,
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "basin_metrics",
+    oAuth2Scopes: [],
+    resolvedSecurity: requestSecurity,
+    securitySource: client._options.accessToken,
+    retryConfig: options?.retries || client._options.retryConfig || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"]
+  };
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "GET",
+    baseURL: options?.serverURL,
+    path,
+    headers,
+    query: query2,
+    body,
+    userAgent: client._options.userAgent,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["400", "403", "4XX", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req }
+  };
+  const [result] = await match(json(200, MetricSetResponse$inboundSchema), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+  return [result, { status: "complete", request: req, response }];
+}
+var init_metricsBasinMetrics = __esm(() => {
+  init_encodings();
+  init_matchers();
+  init_primitives();
+  init_schemas();
+  init_security();
+  init_url();
+  init_components();
+  init_errors2();
+  init_operations();
+  init_async();
+});
+
+// src/mcp-server/tools/metricsBasinMetrics.ts
+var args11, tool$metricsBasinMetrics;
+var init_metricsBasinMetrics2 = __esm(() => {
+  init_metricsBasinMetrics();
+  init_operations();
+  init_tools();
+  args11 = {
+    request: BasinMetricsRequest$inboundSchema
+  };
+  tool$metricsBasinMetrics = {
+    name: "metrics-basin-metrics",
+    description: `Get metrics for a basin.`,
+    scopes: ["read", "read", "read"],
+    args: args11,
+    tool: async (client, args12, ctx) => {
+      const [result, apiCall] = await metricsBasinMetrics(client, args12.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+      if (!result.ok) {
+        return {
+          content: [{ type: "text", text: result.error.message }],
+          isError: true
+        };
+      }
+      const value2 = result.value;
+      return formatResult(value2, apiCall);
+    }
+  };
+});
+
+// src/funcs/metricsStreamMetrics.ts
+function metricsStreamMetrics(client, request, options) {
+  return new APIPromise($do12(client, request, options));
+}
+async function $do12(client, request, options) {
+  const parsed = safeParse(request, (value2) => StreamMetricsRequest$outboundSchema.parse(value2), "Input validation failed");
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = null;
+  const pathParams = {
+    basin: encodeSimple("basin", payload.basin, {
+      explode: false,
+      charEncoding: "percent"
+    }),
+    stream: encodeSimple("stream", payload.stream, {
+      explode: false,
+      charEncoding: "percent"
+    })
+  };
+  const path = pathToFunc("/metrics/{basin}/{stream}")(pathParams);
+  const headers = new Headers(compactMap({
+    Accept: "application/json"
+  }));
+  const secConfig = await extractSecurity(client._options.accessToken);
+  const securityInput = secConfig == null ? {} : { accessToken: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+  const context = {
+    options: client._options,
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "stream_metrics",
+    oAuth2Scopes: [],
+    resolvedSecurity: requestSecurity,
+    securitySource: client._options.accessToken,
+    retryConfig: options?.retries || client._options.retryConfig || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"]
+  };
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "GET",
+    baseURL: options?.serverURL,
+    path,
+    headers,
+    body,
+    userAgent: client._options.userAgent,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["400", "403", "4XX", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req }
+  };
+  const [result] = await match(json(200, MetricSetResponse$inboundSchema), jsonErr([400, 403], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+  return [result, { status: "complete", request: req, response }];
+}
+var init_metricsStreamMetrics = __esm(() => {
+  init_encodings();
+  init_matchers();
+  init_primitives();
+  init_schemas();
+  init_security();
+  init_url();
+  init_components();
+  init_errors2();
+  init_operations();
+  init_async();
+});
+
+// src/mcp-server/tools/metricsStreamMetrics.ts
+var args12, tool$metricsStreamMetrics;
+var init_metricsStreamMetrics2 = __esm(() => {
+  init_metricsStreamMetrics();
+  init_operations();
+  init_tools();
+  args12 = {
+    request: StreamMetricsRequest$inboundSchema
+  };
+  tool$metricsStreamMetrics = {
+    name: "metrics-stream-metrics",
+    description: `Get metrics for a stream.`,
+    scopes: ["read", "read", "read"],
+    args: args12,
+    tool: async (client, args13, ctx) => {
+      const [result, apiCall] = await metricsStreamMetrics(client, args13.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+      if (!result.ok) {
+        return {
+          content: [{ type: "text", text: result.error.message }],
+          isError: true
+        };
+      }
+      const value2 = result.value;
+      return formatResult(value2, apiCall);
+    }
+  };
+});
+
+// src/funcs/recordsAppend.ts
+function recordsAppend(client, request, options) {
+  return new APIPromise($do13(client, request, options));
+}
+async function $do13(client, request, options) {
   const parsed = safeParse(request, (value2) => AppendRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -42475,6 +43310,7 @@ async function $do10(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "append",
     oAuth2Scopes: [],
@@ -42490,6 +43326,7 @@ async function $do10(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42509,7 +43346,7 @@ async function $do10(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, AppendAck$inboundSchema), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(412, AppendConditionFailed$inboundSchema), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, AppendAck$inboundSchema), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(412, AppendConditionFailed$inboundSchema), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42530,12 +43367,12 @@ var init_recordsAppend = __esm(() => {
 });
 
 // src/mcp-server/tools/recordsAppend.ts
-var args10, tool$recordsAppend;
+var args13, tool$recordsAppend;
 var init_recordsAppend2 = __esm(() => {
   init_recordsAppend();
   init_operations();
   init_tools();
-  args10 = {
+  args13 = {
     request: AppendRequest$inboundSchema
   };
   tool$recordsAppend = {
@@ -42544,9 +43381,9 @@ var init_recordsAppend2 = __esm(() => {
 
 Append a batch of records to a stream.`,
     scopes: ["write", "write", "write"],
-    args: args10,
-    tool: async (client, args11, ctx) => {
-      const [result, apiCall] = await recordsAppend(client, args11.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args13,
+    tool: async (client, args14, ctx) => {
+      const [result, apiCall] = await recordsAppend(client, args14.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -42561,9 +43398,9 @@ Append a batch of records to a stream.`,
 
 // src/funcs/recordsCheckTail.ts
 function recordsCheckTail(client, request, options) {
-  return new APIPromise($do11(client, request, options));
+  return new APIPromise($do14(client, request, options));
 }
-async function $do11(client, request, options) {
+async function $do14(client, request, options) {
   const parsed = safeParse(request, (value2) => CheckTailRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -42591,6 +43428,7 @@ async function $do11(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "check_tail",
     oAuth2Scopes: [],
@@ -42606,6 +43444,7 @@ async function $do11(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42625,7 +43464,7 @@ async function $do11(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, TailResponse$inboundSchema), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, TailResponse$inboundSchema), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42646,12 +43485,12 @@ var init_recordsCheckTail = __esm(() => {
 });
 
 // src/mcp-server/tools/recordsCheckTail.ts
-var args11, tool$recordsCheckTail;
+var args14, tool$recordsCheckTail;
 var init_recordsCheckTail2 = __esm(() => {
   init_recordsCheckTail();
   init_operations();
   init_tools();
-  args11 = {
+  args14 = {
     request: CheckTailRequest$inboundSchema
   };
   tool$recordsCheckTail = {
@@ -42660,9 +43499,9 @@ var init_recordsCheckTail2 = __esm(() => {
 
 Check the tail of a stream.`,
     scopes: ["read", "read", "read"],
-    args: args11,
-    tool: async (client, args12, ctx) => {
-      const [result, apiCall] = await recordsCheckTail(client, args12.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args14,
+    tool: async (client, args15, ctx) => {
+      const [result, apiCall] = await recordsCheckTail(client, args15.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -42677,9 +43516,9 @@ Check the tail of a stream.`,
 
 // src/funcs/recordsRead.ts
 function recordsRead(client, request, options) {
-  return new APIPromise($do12(client, request, options));
+  return new APIPromise($do15(client, request, options));
 }
-async function $do12(client, request, options) {
+async function $do15(client, request, options) {
   const parsed = safeParse(request, (value2) => ReadRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -42701,7 +43540,8 @@ async function $do12(client, request, options) {
     count: payload.count,
     seq_num: payload.seq_num,
     tail_offset: payload.tail_offset,
-    timestamp: payload.timestamp
+    timestamp: payload.timestamp,
+    until: payload.until
   });
   const headers = new Headers(compactMap({
     Accept: options?.acceptHeaderOverride || "application/json;q=1, text/event-stream;q=0",
@@ -42718,6 +43558,7 @@ async function $do12(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "read",
     oAuth2Scopes: [],
@@ -42734,6 +43575,7 @@ async function $do12(client, request, options) {
     headers,
     query: query2,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42755,7 +43597,7 @@ async function $do12(client, request, options) {
   };
   const [result] = await match(json(200, ReadResponse$inboundSchema), sse(200, ReadResponse$inboundSchema, {
     sseSentinel: "[DONE]"
-  }), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(416, TailResponse$inboundSchema2), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  }), jsonErr([400, 401, 404, 409], ErrorResponse$inboundSchema), jsonErr(416, TailResponse$inboundSchema2), jsonErr(500, ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42775,12 +43617,12 @@ var init_recordsRead = __esm(() => {
 });
 
 // src/mcp-server/tools/recordsRead.ts
-var args12, tool$recordsRead;
+var args15, tool$recordsRead;
 var init_recordsRead2 = __esm(() => {
   init_recordsRead();
   init_operations();
   init_tools();
-  args12 = {
+  args15 = {
     request: ReadRequest$inboundSchema
   };
   tool$recordsRead = {
@@ -42789,9 +43631,9 @@ var init_recordsRead2 = __esm(() => {
 
 Retrieve a batch of records, or set \`Accept: text/event-stream\` to stream using server-sent events.`,
     scopes: ["read", "read", "read"],
-    args: args12,
-    tool: async (client, args13, ctx) => {
-      const [result, apiCall] = await recordsRead(client, args13.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args15,
+    tool: async (client, args16, ctx) => {
+      const [result, apiCall] = await recordsRead(client, args16.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -42806,9 +43648,9 @@ Retrieve a batch of records, or set \`Accept: text/event-stream\` to stream usin
 
 // src/funcs/streamsCreateOrReconfigureStream.ts
 function streamsCreateOrReconfigureStream(client, request, options) {
-  return new APIPromise($do13(client, request, options));
+  return new APIPromise($do16(client, request, options));
 }
-async function $do13(client, request, options) {
+async function $do16(client, request, options) {
   const parsed = safeParse(request, (value2) => CreateOrReconfigureStreamRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -42840,6 +43682,7 @@ async function $do13(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "create_or_reconfigure_stream",
     oAuth2Scopes: [],
@@ -42855,6 +43698,7 @@ async function $do13(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42874,7 +43718,7 @@ async function $do13(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(201, StreamInfo$inboundSchema.optional()), nil(204, StreamInfo$inboundSchema.optional()), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(201, StreamInfo$inboundSchema.optional()), nil(204, StreamInfo$inboundSchema.optional()), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -42895,21 +43739,21 @@ var init_streamsCreateOrReconfigureStream = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsCreateOrReconfigureStream.ts
-var args13, tool$streamsCreateOrReconfigureStream;
+var args16, tool$streamsCreateOrReconfigureStream;
 var init_streamsCreateOrReconfigureStream2 = __esm(() => {
   init_streamsCreateOrReconfigureStream();
   init_operations();
   init_tools();
-  args13 = {
+  args16 = {
     request: CreateOrReconfigureStreamRequest$inboundSchema
   };
   tool$streamsCreateOrReconfigureStream = {
     name: "streams-create-or-reconfigure-stream",
     description: `Create or reconfigure a stream.`,
     scopes: ["write", "write", "write"],
-    args: args13,
-    tool: async (client, args14, ctx) => {
-      const [result, apiCall] = await streamsCreateOrReconfigureStream(client, args14.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args16,
+    tool: async (client, args17, ctx) => {
+      const [result, apiCall] = await streamsCreateOrReconfigureStream(client, args17.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -42924,9 +43768,9 @@ var init_streamsCreateOrReconfigureStream2 = __esm(() => {
 
 // src/funcs/streamsCreateStream.ts
 function streamsCreateStream(client, request, options) {
-  return new APIPromise($do14(client, request, options));
+  return new APIPromise($do17(client, request, options));
 }
-async function $do14(client, request, options) {
+async function $do17(client, request, options) {
   const parsed = safeParse(request, (value2) => CreateStreamRequest$outboundSchema2.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -42951,6 +43795,7 @@ async function $do14(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "create_stream",
     oAuth2Scopes: [],
@@ -42966,6 +43811,7 @@ async function $do14(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -42985,7 +43831,7 @@ async function $do14(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(201, StreamInfo$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(201, StreamInfo$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -43006,21 +43852,21 @@ var init_streamsCreateStream = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsCreateStream.ts
-var args14, tool$streamsCreateStream;
+var args17, tool$streamsCreateStream;
 var init_streamsCreateStream2 = __esm(() => {
   init_streamsCreateStream();
   init_operations();
   init_tools();
-  args14 = {
+  args17 = {
     request: CreateStreamRequest$inboundSchema2
   };
   tool$streamsCreateStream = {
     name: "streams-create-stream",
     description: `Create a stream.`,
     scopes: ["write", "write", "write"],
-    args: args14,
-    tool: async (client, args15, ctx) => {
-      const [result, apiCall] = await streamsCreateStream(client, args15.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args17,
+    tool: async (client, args18, ctx) => {
+      const [result, apiCall] = await streamsCreateStream(client, args18.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -43035,9 +43881,9 @@ var init_streamsCreateStream2 = __esm(() => {
 
 // src/funcs/streamsDeleteStream.ts
 function streamsDeleteStream(client, request, options) {
-  return new APIPromise($do15(client, request, options));
+  return new APIPromise($do18(client, request, options));
 }
-async function $do15(client, request, options) {
+async function $do18(client, request, options) {
   const parsed = safeParse(request, (value2) => DeleteStreamRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -43065,6 +43911,7 @@ async function $do15(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "delete_stream",
     oAuth2Scopes: [],
@@ -43080,6 +43927,7 @@ async function $do15(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -43099,7 +43947,7 @@ async function $do15(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(nil(202, voidType()), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(nil(202, voidType()), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -43120,21 +43968,21 @@ var init_streamsDeleteStream = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsDeleteStream.ts
-var args15, tool$streamsDeleteStream;
+var args18, tool$streamsDeleteStream;
 var init_streamsDeleteStream2 = __esm(() => {
   init_streamsDeleteStream();
   init_operations();
   init_tools();
-  args15 = {
+  args18 = {
     request: DeleteStreamRequest$inboundSchema
   };
   tool$streamsDeleteStream = {
     name: "streams-delete-stream",
     description: `Delete a stream.`,
     scopes: ["write", "write", "write"],
-    args: args15,
-    tool: async (client, args16, ctx) => {
-      const [result, apiCall] = await streamsDeleteStream(client, args16.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args18,
+    tool: async (client, args19, ctx) => {
+      const [result, apiCall] = await streamsDeleteStream(client, args19.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -43148,9 +43996,9 @@ var init_streamsDeleteStream2 = __esm(() => {
 
 // src/funcs/streamsGetStreamConfig.ts
 function streamsGetStreamConfig(client, request, options) {
-  return new APIPromise($do16(client, request, options));
+  return new APIPromise($do19(client, request, options));
 }
-async function $do16(client, request, options) {
+async function $do19(client, request, options) {
   const parsed = safeParse(request, (value2) => GetStreamConfigRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -43178,6 +44026,7 @@ async function $do16(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "get_stream_config",
     oAuth2Scopes: [],
@@ -43193,6 +44042,7 @@ async function $do16(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -43212,7 +44062,7 @@ async function $do16(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, StreamConfig$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, StreamConfig$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -43233,21 +44083,21 @@ var init_streamsGetStreamConfig = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsGetStreamConfig.ts
-var args16, tool$streamsGetStreamConfig;
+var args19, tool$streamsGetStreamConfig;
 var init_streamsGetStreamConfig2 = __esm(() => {
   init_streamsGetStreamConfig();
   init_operations();
   init_tools();
-  args16 = {
+  args19 = {
     request: GetStreamConfigRequest$inboundSchema
   };
   tool$streamsGetStreamConfig = {
     name: "streams-get-stream-config",
     description: `Get stream configuration.`,
     scopes: ["read", "read", "read"],
-    args: args16,
-    tool: async (client, args17, ctx) => {
-      const [result, apiCall] = await streamsGetStreamConfig(client, args17.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args19,
+    tool: async (client, args20, ctx) => {
+      const [result, apiCall] = await streamsGetStreamConfig(client, args20.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -43262,9 +44112,9 @@ var init_streamsGetStreamConfig2 = __esm(() => {
 
 // src/funcs/streamsListStreams.ts
 function streamsListStreams(client, request, options) {
-  return new APIPromise($do17(client, request, options));
+  return new APIPromise($do20(client, request, options));
 }
-async function $do17(client, request, options) {
+async function $do20(client, request, options) {
   const parsed = safeParse(request, (value2) => ListStreamsRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [haltIterator(parsed), { status: "invalid" }];
@@ -43291,6 +44141,7 @@ async function $do17(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "list_streams",
     oAuth2Scopes: [],
@@ -43307,6 +44158,7 @@ async function $do17(client, request, options) {
     headers,
     query: query2,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -43328,7 +44180,7 @@ async function $do17(client, request, options) {
   };
   const [result, raw] = await match(json(200, ListStreamsResponse$inboundSchema2, {
     key: "Result"
-  }), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  }), jsonErr([400, 403, 404], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [haltIterator(result), {
       status: "complete",
@@ -43370,21 +44222,21 @@ var init_streamsListStreams = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsListStreams.ts
-var args17, tool$streamsListStreams;
+var args20, tool$streamsListStreams;
 var init_streamsListStreams2 = __esm(() => {
   init_streamsListStreams();
   init_operations();
   init_tools();
-  args17 = {
+  args20 = {
     request: ListStreamsRequest$inboundSchema
   };
   tool$streamsListStreams = {
     name: "streams-list-streams",
     description: `List streams.`,
     scopes: ["read", "read", "read"],
-    args: args17,
-    tool: async (client, args18, ctx) => {
-      const [result, apiCall] = await streamsListStreams(client, args18.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args20,
+    tool: async (client, args21, ctx) => {
+      const [result, apiCall] = await streamsListStreams(client, args21.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -43399,9 +44251,9 @@ var init_streamsListStreams2 = __esm(() => {
 
 // src/funcs/streamsReconfigureStream.ts
 function streamsReconfigureStream(client, request, options) {
-  return new APIPromise($do18(client, request, options));
+  return new APIPromise($do21(client, request, options));
 }
-async function $do18(client, request, options) {
+async function $do21(client, request, options) {
   const parsed = safeParse(request, (value2) => ReconfigureStreamRequest$outboundSchema.parse(value2), "Input validation failed");
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
@@ -43432,6 +44284,7 @@ async function $do18(client, request, options) {
   const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
   const context = {
+    options: client._options,
     baseURL: baseURL ?? "",
     operationID: "reconfigure_stream",
     oAuth2Scopes: [],
@@ -43447,6 +44300,7 @@ async function $do18(client, request, options) {
     path,
     headers,
     body,
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1
   }, options);
   if (!requestRes.ok) {
@@ -43466,7 +44320,7 @@ async function $do18(client, request, options) {
   const responseFields = {
     HttpMeta: { Response: response, Request: req }
   };
-  const [result] = await match(json(200, StreamConfig$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, { extraFields: responseFields });
+  const [result] = await match(json(200, StreamConfig$inboundSchema), jsonErr([400, 403, 404, 409], ErrorResponse$inboundSchema), fail("4XX"), fail("5XX"))(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }
@@ -43487,21 +44341,21 @@ var init_streamsReconfigureStream = __esm(() => {
 });
 
 // src/mcp-server/tools/streamsReconfigureStream.ts
-var args18, tool$streamsReconfigureStream;
+var args21, tool$streamsReconfigureStream;
 var init_streamsReconfigureStream2 = __esm(() => {
   init_streamsReconfigureStream();
   init_operations();
   init_tools();
-  args18 = {
+  args21 = {
     request: ReconfigureStreamRequest$inboundSchema
   };
   tool$streamsReconfigureStream = {
     name: "streams-reconfigure-stream",
     description: `Reconfigure a stream.`,
     scopes: ["write", "write", "write"],
-    args: args18,
-    tool: async (client, args19, ctx) => {
-      const [result, apiCall] = await streamsReconfigureStream(client, args19.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
+    args: args21,
+    tool: async (client, args22, ctx) => {
+      const [result, apiCall] = await streamsReconfigureStream(client, args22.request, { fetchOptions: { signal: ctx.signal } }).$inspect();
       if (!result.ok) {
         return {
           content: [{ type: "text", text: result.error.message }],
@@ -43518,7 +44372,7 @@ var init_streamsReconfigureStream2 = __esm(() => {
 function createMCPServer(deps) {
   const server = new McpServer({
     name: "S2",
-    version: "0.14.0"
+    version: "0.15.1"
   });
   const client = new S2Core({
     accessToken: deps.accessToken,
@@ -43541,6 +44395,9 @@ function createMCPServer(deps) {
   tool(tool$basinsCreateOrReconfigureBasin);
   tool(tool$basinsDeleteBasin);
   tool(tool$basinsReconfigureBasin);
+  tool(tool$metricsAccountMetrics);
+  tool(tool$metricsBasinMetrics);
+  tool(tool$metricsStreamMetrics);
   tool(tool$streamsListStreams);
   tool(tool$streamsCreateStream);
   tool(tool$streamsGetStreamConfig);
@@ -43566,6 +44423,9 @@ var init_server2 = __esm(() => {
   init_basinsGetBasinConfig2();
   init_basinsListBasins2();
   init_basinsReconfigureBasin2();
+  init_metricsAccountMetrics2();
+  init_metricsBasinMetrics2();
+  init_metricsStreamMetrics2();
   init_recordsAppend2();
   init_recordsCheckTail2();
   init_recordsRead2();
@@ -44771,7 +45631,7 @@ var routes = rn({
 var app = Ve(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.14.0"
+    currentVersion: "0.15.1"
   }
 });
 _t(app, process3.argv.slice(2), buildContext(process3));
@@ -44779,5 +45639,5 @@ export {
   app
 };
 
-//# debugId=FBE343C91ADA849A64756E2164756E21
+//# debugId=BAB6F4539938DA0264756E2164756E21
 //# sourceMappingURL=mcp-server.js.map